From: mahesh.kulkarni@nokia.com Date: Wed, 8 Feb 2012 12:24:50 +0000 (+0000) Subject: [Qt] Build broken if qt missing openssl X-Git-Tag: 070512121124~13474 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb6dde739d02427281d8bcbdc27c46193bb8244d;p=profile%2Fivi%2Fwebkit-efl.git [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): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107070 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 5774e59..0340c9d 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,15 @@ +2012-02-08 Mahesh Kulkarni + + [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 [WK2] Text notifications should have an iconURL diff --git a/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp b/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp index aa48756..28efc0c 100644 --- a/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp +++ b/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp @@ -111,8 +111,14 @@ void QtNetworkAccessManager::onSslErrors(QNetworkReply* reply, const QListsendSync( 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 + } } }