Merge remote-tracking branch 'origin/5.13' into 5.14

Conflicts:
	config.tests/glibc/glibc.cpp
	src/3rdparty
	src/core/configure.json
	src/core/profile_io_data_qt.cpp
	src/webengine/configure.json
	src/webenginewidgets/api/qwebenginepage.cpp
	tests/auto/widgets/qwebenginepage/BLACKLIST

Change-Id: I3e1781048c3cb09bfbf7427dfc5dd1fec11a2b97

3 files changed, 9 insertions, 7 deletions

diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index 57434e296..edad7ec44 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -157,7 +157,10 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineDownloadItem::MimeHtmlSaveFormat, QtWebEngineC
     \fn QQuickWebEngineProfile::presentNotification(QWebEngineNotification *notification)
 
     This signal is emitted whenever there is a newly created user notification.
-    The \a notification argument holds the notification instance to query data and interact with.
+    The \a notification argument holds the \l {QWebEngineNotification} instance
+    to query data and interact with.
+
+    \sa WebEngineProfile::presentNotification
 */
 
 QQuickWebEngineProfilePrivate::QQuickWebEngineProfilePrivate(ProfileAdapter *profileAdapter)
@@ -395,7 +398,8 @@ void QQuickWebEngineProfilePrivate::userScripts_clear(QQmlListProperty<QQuickWeb
     \since QtWebEngine 1.9
 
     This signal is emitted whenever there is a newly created user notification.
-    The \a notification argument holds the notification instance to query data and interact with.
+    The \a notification argument holds the \l {WebEngineNotification} instance
+    to query data and interact with.
 */
 
 /*!
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 93a3668ed..9a102a504 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -250,7 +250,7 @@ bool QQuickWebEngineSettings::pluginsEnabled() const
 
     Tells the web engine whether fullscreen is supported in this application or not.
 
-    Enabled by default.
+    Disabled by default.
 */
 bool QQuickWebEngineSettings::fullScreenSupportEnabled() const
 {
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 58d950cd9..8a1a3c516 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -297,7 +297,7 @@ void QQuickWebEngineViewPrivate::allowCertificateError(const QSharedPointer<Cert
     // mark the object for gc by creating temporary jsvalue
     qmlEngine(q)->newQObject(quickController);
     Q_EMIT q->certificateError(quickController);
-    if (!quickController->deferred() && !quickController->answered())
+    if (!quickController->overridable() || (!quickController->deferred() && !quickController->answered()))
         quickController->rejectCertificate();
     else
         m_certificateErrorControllers.append(errorController);
@@ -1152,9 +1152,7 @@ void QQuickWebEngineViewPrivate::updateAdapter()
     adapter->setClient(this);
     if (wasInitialized) {
         if (!m_html.isEmpty())
-            adapter->setContent(m_html.toUtf8(), defaultMimeType, m_url);
-        else if (m_url.isValid())
-            adapter->load(m_url);
+            adapter->setContent(m_html.toUtf8(), defaultMimeType, activeUrl);
         else if (activeUrl.isValid())
             adapter->load(activeUrl);
         else