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

Conflicts:
	configure.pri
	src/pdf/api/qpdfpagerenderer.h

Change-Id: I7e68277080e29238bbfe8511539ea75b2db89489

11 files changed, 43 insertions, 23 deletions

diff --git a/src/webengine/api/qquickwebenginecertificateerror.cpp b/src/webengine/api/qquickwebenginecertificateerror.cpp
index 855e61817..63beb1bae 100644
--- a/src/webengine/api/qquickwebenginecertificateerror.cpp
+++ b/src/webengine/api/qquickwebenginecertificateerror.cpp
@@ -200,6 +200,10 @@ QUrl QQuickWebEngineCertificateError::url() const
     \value  WebEngineCertificateError.CertificateTransparencyRequired
             Certificate Transparency was required for this connection, but the server
             did not provide CT information that complied with the policy. (Added in 5.8)
+    \value  WebEngineCertificateError.CertificateKnownInterceptionBlocked
+            The certificate is known to be used for interception by an entity other
+            the device owner. (Added in 5.15)
+
 */
 QQuickWebEngineCertificateError::Error QQuickWebEngineCertificateError::error() const
 {
diff --git a/src/webengine/api/qquickwebenginecertificateerror_p.h b/src/webengine/api/qquickwebenginecertificateerror_p.h
index 77fbe27aa..4a8ef6ae0 100644
--- a/src/webengine/api/qquickwebenginecertificateerror_p.h
+++ b/src/webengine/api/qquickwebenginecertificateerror_p.h
@@ -85,6 +85,7 @@ public:
         CertificateNameConstraintViolation = -212,
         CertificateValidityTooLong = -213,
         CertificateTransparencyRequired = -214,
+        CertificateKnownInterceptionBlocked = -217,
     };
     Q_ENUM(Error)
 
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 9a102a504..78fbe16e8 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -404,10 +404,14 @@ bool QQuickWebEngineSettings::showScrollBars() const
   \qmlproperty bool WebEngineSettings::playbackRequiresUserGesture
   \since QtWebEngine 1.7
   Inhibits playback of media content until the user interacts with
-  the page. Disabled by default.
+  the page.
+
+  By default, Qt WebEngine uses Chromium settings, as described in
+  \l {Autoplay Policy Changes}. To overwrite the default behavior,
+  this property must be set to \c false.
 
   \note The behavior is similar to Chrome on Android when enabled,
-  and similar to Chrome on desktops when disabled (default).
+  and similar to Chrome on desktops when disabled.
 */
 bool QQuickWebEngineSettings::playbackRequiresUserGesture() const
 {
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 238ad25b2..afb0fbd25 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -316,16 +316,25 @@ void QQuickWebEngineViewPrivate::selectClientCert(const QSharedPointer<ClientCer
 #endif
 }
 
-void QQuickWebEngineViewPrivate::runGeolocationPermissionRequest(const QUrl &url)
+static QQuickWebEngineView::Feature toFeature(QtWebEngineCore::ProfileAdapter::PermissionType type)
 {
-    Q_Q(QQuickWebEngineView);
-    Q_EMIT q->featurePermissionRequested(url, QQuickWebEngineView::Geolocation);
+    switch (type) {
+    case QtWebEngineCore::ProfileAdapter::NotificationPermission:
+        return QQuickWebEngineView::Notifications;
+    case QtWebEngineCore::ProfileAdapter::GeolocationPermission:
+        return QQuickWebEngineView::Geolocation;
+    default:
+        break;
+    }
+    Q_UNREACHABLE();
+    return QQuickWebEngineView::Feature(-1);
 }
 
-void QQuickWebEngineViewPrivate::runUserNotificationPermissionRequest(const QUrl &url)
+
+void QQuickWebEngineViewPrivate::runFeaturePermissionRequest(QtWebEngineCore::ProfileAdapter::PermissionType permission, const QUrl &url)
 {
     Q_Q(QQuickWebEngineView);
-    Q_EMIT q->featurePermissionRequested(url, QQuickWebEngineView::Notifications);
+    Q_EMIT q->featurePermissionRequested(url, toFeature(permission));
 }
 
 void QQuickWebEngineViewPrivate::showColorDialog(QSharedPointer<ColorChooserController> controller)
@@ -1629,7 +1638,7 @@ void QQuickWebEngineView::grantFeaturePermission(const QUrl &securityOrigin, QQu
         d_ptr->adapter->grantMediaAccessPermission(securityOrigin, WebContentsAdapterClient::MediaRequestFlags(WebContentsAdapterClient::MediaAudioCapture                                                                                                               | WebContentsAdapterClient::MediaVideoCapture));
         break;
     case Geolocation:
-        d_ptr->adapter->runGeolocationRequestCallback(securityOrigin, granted);
+        d_ptr->adapter->runFeatureRequestCallback(securityOrigin, ProfileAdapter::GeolocationPermission,  granted);
         break;
     case DesktopVideoCapture:
         d_ptr->adapter->grantMediaAccessPermission(securityOrigin, WebContentsAdapterClient::MediaDesktopVideoCapture);
@@ -1642,7 +1651,7 @@ void QQuickWebEngineView::grantFeaturePermission(const QUrl &securityOrigin, QQu
                 WebContentsAdapterClient::MediaDesktopVideoCapture));
         break;
     case Notifications:
-        d_ptr->adapter->runUserNotificationRequestCallback(securityOrigin, granted);
+        d_ptr->adapter->runFeatureRequestCallback(securityOrigin, ProfileAdapter::NotificationPermission,  granted);
         break;
     default:
         Q_UNREACHABLE();
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 6f9b552ec..5c884e36e 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -148,8 +148,7 @@ public:
     QtWebEngineCore::WebEngineSettings *webEngineSettings() const override;
     void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController) override;
     void selectClientCert(const QSharedPointer<ClientCertSelectController> &selectController) override;
-    void runGeolocationPermissionRequest(QUrl const&) override;
-    void runUserNotificationPermissionRequest(QUrl const&) override;
+    void runFeaturePermissionRequest(QtWebEngineCore::ProfileAdapter::PermissionType permission, const QUrl &securityOrigin) override;
     void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode) override;
     void requestGeometryChange(const QRect &geometry, const QRect &frameGeometry) override;
     void updateScrollPosition(const QPointF &position) override;
diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webengine/doc/src/external-resources.qdoc
index 55f6a68a3..acf63fb04 100644
--- a/src/webengine/doc/src/external-resources.qdoc
+++ b/src/webengine/doc/src/external-resources.qdoc
@@ -139,3 +139,8 @@
     \externalpage https://www.w3.org/TR/notifications
     \title Web Notifications API
 */
+
+/*!
+    \externalpage https://developers.google.com/web/updates/2017/09/autoplay-policy-changes
+    \title Autoplay Policy Changes
+*/
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 3533b0327..1c30f9858 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -89,7 +89,7 @@
     \l{https://chromium.googlesource.com/chromium/src/+/master/docs/chromium_browser_vs_google_chrome.md}{overview}
     that is part of the documentation in the \l {Chromium Project} upstream source tree.
 
-    This version of \QWE is based on Chromium version 77.0.3865, with additional security
+    This version of \QWE is based on Chromium version 80.0.3987, with additional security
     fixes from newer versions.
 
     \section2 Qt WebEngine Process
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index 1af2141b1..982363bb2 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -87,7 +87,7 @@
     \section2 Linux
 
     On Linux, Clang or GCC version 5 or later is required.
-    Supported configurations are \c linux-g++ and \c{linux-clang}.
+    Supported configurations are \c linux-g++, \c{linux-clang} and \c{linux-clang-libc++}
 
     \QWE requires \c pkg-config to detect most of its dependencies. The
     following \c pkg-config files are required:
@@ -117,9 +117,9 @@
     On \macos, the following are required:
 
     \list
-        \li \macos 10.12 or later
-        \li Xcode 8.3.3 or later
-        \li \macos 10.12 SDK or later
+        \li \macos 10.13 or later
+        \li Xcode 10.0 or later
+        \li \macos 10.13 SDK or later
     \endlist
 
     \note \QWE cannot be built for the 32-bit mode of \macos (using the
@@ -128,8 +128,8 @@
     \section1 Using Earlier Qt Versions to Build \QWE
 
     Building \QWE with earlier Qt versions (down to the last LTS
-    version) is supported. It means that \QWE 5.11 can be built with
-    Qt 5.9.x, Qt 5.10.x, and Qt 5.11.
+    version) is supported. It means that \QWE 5.15 can be built with
+    Qt 5.12.x, Qt 5.14.x, and Qt 5.15.
 
     To use an earlier Qt version to build Qt Webengine:
 
diff --git a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
index 44e6c7e27..4fd7e3a3b 100644
--- a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
+++ b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
@@ -35,9 +35,9 @@
     The QML types can be imported into your application using the following import statements in
     your .qml file:
 
-    \badcode
+    \qml
     import QtWebEngine 1.10
-    \endcode
+    \endqml
 
     To link against the module, add the following QT variable to your qmake .pro
     file:
diff --git a/src/webengine/doc/src/qwebengine-licensing.qdoc b/src/webengine/doc/src/qwebengine-licensing.qdoc
index 8795ca44c..f6a0a6c32 100644
--- a/src/webengine/doc/src/qwebengine-licensing.qdoc
+++ b/src/webengine/doc/src/qwebengine-licensing.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-\contentspage qtwebengine-licensing.html
 \group qtwebengine-licensing
 \title Qt WebEngine Licensing
 
@@ -43,7 +42,6 @@ Third party licenses included in the sources are:
 */
 
 /*!
-\contentspage qtwebengine-licensing.html
 \page qtwebengine-3rdparty-chromium-global.html attribution
 \ingroup qtwebengine-licensing
 \title Chromium License
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
index d3ebdbf27..1de4d8835 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
@@ -48,7 +48,7 @@ RenderWidgetHostViewQtDelegateQuickWindow::RenderWidgetHostViewQtDelegateQuickWi
     : m_realDelegate(realDelegate)
     , m_virtualParent(nullptr)
 {
-    setFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
+    setFlags(Qt::Tool | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
 }
 
 RenderWidgetHostViewQtDelegateQuickWindow::~RenderWidgetHostViewQtDelegateQuickWindow()