Title: [107070] trunk/Source/WebKit2
- Revision
- 107070
- Author
- mahesh.kulka...@nokia.com
- Date
- 2012-02-08 04:24:50 -0800 (Wed, 08 Feb 2012)
Log Message
[Qt] Build broken if qt missing openssl
https://bugs.webkit.org/show_bug.cgi?id=77894
Reviewed by Chang Shu.
Build fix. No new test content.
* WebProcess/qt/QtNetworkAccessManager.cpp:
(WebKit::QtNetworkAccessManager::onSslErrors):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (107069 => 107070)
--- trunk/Source/WebKit2/ChangeLog 2012-02-08 12:18:40 UTC (rev 107069)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-08 12:24:50 UTC (rev 107070)
@@ -1,3 +1,15 @@
+2012-02-08 Mahesh Kulkarni <mahesh.kulka...@nokia.com>
+
+ [Qt] Build broken if qt missing openssl
+ https://bugs.webkit.org/show_bug.cgi?id=77894
+
+ Reviewed by Chang Shu.
+
+ Build fix. No new test content.
+
+ * WebProcess/qt/QtNetworkAccessManager.cpp:
+ (WebKit::QtNetworkAccessManager::onSslErrors):
+
2012-02-08 Yael Aharon <yael.aha...@nokia.com>
[WK2] Text notifications should have an iconURL
Modified: trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp (107069 => 107070)
--- trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp 2012-02-08 12:18:40 UTC (rev 107069)
+++ trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp 2012-02-08 12:24:50 UTC (rev 107070)
@@ -111,8 +111,14 @@
if (webPage->sendSync(
Messages::WebPageProxy::CertificateVerificationRequest(hostname),
Messages::WebPageProxy::CertificateVerificationRequest::Reply(ignoreErrors))) {
- if (ignoreErrors)
+ if (ignoreErrors) {
+#ifndef QT_NO_OPENSSL
reply->ignoreSslErrors(qSslErrors);
+#else
+ Q_UNUSED(qSslErrors);
+ reply->ignoreSslErrors();
+#endif
+ }
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
