From 815f1ed417bd26fbe2abbdf20ac5d3423b30796c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 23 Jul 2012 09:28:44 +0200
Subject: Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92
 (http://svn.webkit.org/repository/webkit/trunk@123308)

New snapshot with better configure tests
---
 Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp')

diff --git a/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp b/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp
index ce46be854..2251c2ed1 100644
--- a/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp
+++ b/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp
@@ -45,7 +45,9 @@ QtNetworkAccessManager::QtNetworkAccessManager(WebProcess* webProcess)
 {
     connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), SLOT(onAuthenticationRequired(QNetworkReply*, QAuthenticator*)));
     connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)), SLOT(onProxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
+#ifndef QT_NO_SSL
     connect(this, SIGNAL(sslErrors(QNetworkReply*, QList<QSslError>)), SLOT(onSslErrors(QNetworkReply*, QList<QSslError>)));
+#endif
 }
 
 WebPage* QtNetworkAccessManager::obtainOriginatingWebPage(const QNetworkRequest& request)
@@ -126,6 +128,7 @@ void QtNetworkAccessManager::onAuthenticationRequired(QNetworkReply* reply, QAut
 
 void QtNetworkAccessManager::onSslErrors(QNetworkReply* reply, const QList<QSslError>& qSslErrors)
 {
+#ifndef QT_NO_SSL
     WebPage* webPage = obtainOriginatingWebPage(reply->request());
 
     // FIXME: This check can go away once our Qt version is up-to-date. See: QTBUG-23512.
@@ -138,15 +141,10 @@ void QtNetworkAccessManager::onSslErrors(QNetworkReply* reply, const QList<QSslE
     if (webPage->sendSync(
         Messages::WebPageProxy::CertificateVerificationRequest(hostname),
         Messages::WebPageProxy::CertificateVerificationRequest::Reply(ignoreErrors))) {
-        if (ignoreErrors) {
-#ifndef QT_NO_OPENSSL
+        if (ignoreErrors)
             reply->ignoreSslErrors(qSslErrors);
-#else
-            Q_UNUSED(qSslErrors);
-            reply->ignoreSslErrors();
-#endif
-        }
     }
+#endif
 }
 
 }
-- 
cgit v1.2.1