From 5c5fa23d2bf0056742dd1f8fa6b35fa4a9d06606 Mon Sep 17 00:00:00 2001 From: Jussi Laitinen Date: Thu, 28 Oct 2010 10:52:59 +0300 Subject: [PATCH] Added QWebView fix. This should be removed before the release. --- src/ui/mainwindow.cpp | 12 ++++++++++++ src/ui/mainwindow.h | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 63a1719..157ae1c 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -543,6 +543,10 @@ void MainWindow::buildWebView() connect(m_webView, SIGNAL(loadFinished(bool)), this, SLOT(loadDone(bool))); + //Remove + connect(m_webView->page()->networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*,QList)), + this, SLOT(sslErrors(QNetworkReply*,QList))); + m_webView->hide(); } } @@ -1158,3 +1162,11 @@ void MainWindow::webViewRequestFinished(QNetworkReply *reply) emit error(ErrorContext::NETWORK, reply->error()); } } + +//REMOVE THIS +void MainWindow::sslErrors(QNetworkReply *reply, const QList &errors) +{ + qWarning() << __PRETTY_FUNCTION__; + + reply->ignoreSslErrors(); +} diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index bfca0d8..a5a1654 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -30,6 +30,10 @@ #include #include +//Remove this +#include +#include + #include "situareservice/notification.h" #include "network/networkcookiejar.h" @@ -436,6 +440,11 @@ private slots: */ void webViewRequestFinished(QNetworkReply* reply); + /** + * REMOVE THIS, FIXES WEBVIEW BUG IN SCRATCHBOX + */ + void sslErrors(QNetworkReply *reply, const QList &errors); + /******************************************************************************* * SIGNALS ******************************************************************************/ -- 1.7.9.5