Merge remote-tracking branch 'origin/5.12' into dev

Conflicts:
	src/core/render_widget_host_view_qt.cpp
	src/core/web_contents_adapter_client.h
	src/webenginewidgets/api/qwebenginepage_p.h

Change-Id: Ibd011c40839c09469218ac4c71a13d0a0b1c9778

3 files changed, 4 insertions, 4 deletions

diff --git a/examples/webenginewidgets/maps/maps.pro b/examples/webenginewidgets/maps/maps.pro
index b1cb3b28b..fead8fe0b 100644
--- a/examples/webenginewidgets/maps/maps.pro
+++ b/examples/webenginewidgets/maps/maps.pro
@@ -12,6 +12,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/maps
 INSTALLS += target
 
 !qtConfig(webengine-geolocation) {
-    error('Qt WebEngine compiled without geolocaton support, this example will not work.')
+    error('Qt WebEngine compiled without geolocation support, this example will not work.')
 }
 
diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp
index ab9dce4b8..e44410284 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.cpp
+++ b/examples/webenginewidgets/simplebrowser/webpage.cpp
@@ -66,7 +66,7 @@ WebPage::WebPage(QWebEngineProfile *profile, QObject *parent)
     connect(this, &QWebEnginePage::featurePermissionRequested, this, &WebPage::handleFeaturePermissionRequested);
     connect(this, &QWebEnginePage::proxyAuthenticationRequired, this, &WebPage::handleProxyAuthenticationRequired);
     connect(this, &QWebEnginePage::registerProtocolHandlerRequested, this, &WebPage::handleRegisterProtocolHandlerRequested);
-#if QT_CONFIG(ssl)
+#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
     connect(this, &QWebEnginePage::selectClientCertificate, this, &WebPage::handleSelectClientCertificate);
 #endif
 }
@@ -197,7 +197,7 @@ void WebPage::handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolH
 }
 //! [registerProtocolHandlerRequested]
 
-#if QT_CONFIG(ssl)
+#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
 void WebPage::handleSelectClientCertificate(QWebEngineClientCertificateSelection selection)
 {
     // Just select one.
diff --git a/examples/webenginewidgets/simplebrowser/webpage.h b/examples/webenginewidgets/simplebrowser/webpage.h
index 0b351ab31..908295894 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.h
+++ b/examples/webenginewidgets/simplebrowser/webpage.h
@@ -69,7 +69,7 @@ private slots:
     void handleFeaturePermissionRequested(const QUrl &securityOrigin, Feature feature);
     void handleProxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth, const QString &proxyHost);
     void handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
-#if QT_CONFIG(ssl)
+#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
     void handleSelectClientCertificate(QWebEngineClientCertificateSelection clientCertSelection);
 #endif
 };