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

Change-Id: I962033871a1ef624807a4e1869fe869406aa73f7

7 files changed, 42 insertions, 21 deletions

diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index f22ec86a4..260d8958b 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -153,6 +153,8 @@ QQuickWebEngineProfilePrivate::QQuickWebEngineProfilePrivate(QSharedPointer<Brow
 
 QQuickWebEngineProfilePrivate::~QQuickWebEngineProfilePrivate()
 {
+    m_browserContextRef->setRequestInterceptor(nullptr);
+
     m_browserContextRef->removeClient(this);
 
     Q_FOREACH (QQuickWebEngineDownloadItem* download, m_ongoingDownloads) {
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index dac844fdb..ab6a9c79a 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -234,7 +234,7 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
         }
         ui()->addMenuSeparator(menu);
     }
-    if (!data.linkText().isEmpty() && data.linkUrl().isValid()) {
+    if (data.linkUrl().isValid()) {
         item = new MenuItemHandler(menu);
         QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::OpenLinkInThisWindow); });
         ui()->addMenuItem(item, QQuickWebEngineView::tr("Follow Link"));
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf
index fe83b082f..ea9c6f21b 100644
--- a/src/webengine/doc/qtwebengine.qdocconf
+++ b/src/webengine/doc/qtwebengine.qdocconf
@@ -33,7 +33,7 @@ qhp.QtWebEngine.subprojects.examples.indexTitle = Qt WebEngine Examples
 qhp.QtWebEngine.subprojects.examples.selectors = doc:example
 qhp.QtWebEngine.subprojects.examples.sortPages = true
 
-manifestmeta.highlighted.names += "QtWebEngine/WebEngine Markdown Editor Example" \
+manifestmeta.highlighted.names += "QtWebEngine/WebEngine Widgets Simple Browser Example" \
                 "QtWebEngine/WebEngine Quick Nano Browser"
 
 tagfile                 = ../../../doc/qtwebengine/qtwebengine.tags
@@ -67,7 +67,7 @@ exampledirs +=  . \
                 ../../core/doc/snippets \
                 ../../webenginewidgets/doc/snippets
 
-examples.fileextensions += *.aff *.dic
+examples.fileextensions += *.aff *.dic *.html
 
 imagedirs += images
 
diff --git a/src/webengine/doc/src/qtwebengine-deploying.qdoc b/src/webengine/doc/src/qtwebengine-deploying.qdoc
index 351ef49de..8530bc075 100644
--- a/src/webengine/doc/src/qtwebengine-deploying.qdoc
+++ b/src/webengine/doc/src/qtwebengine-deploying.qdoc
@@ -141,11 +141,4 @@
             directory specified by
             QLibraryInfo::location(QLibraryInfo::TranslationsPath)
     \endlist
-
-    \section2 Deploying Audio and Video Codecs
-
-    To support HTML5 video, you must additionally deploy
-    \c ffmpegsumo.dll (WebM codec plugin) into the \c qtwebengine directory
-    under the application install path or under the path that the
-    \c PluginsPath variable was set to in \c qt.conf.
 */
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index ff35b45cf..e180b22c0 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -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 Qt WebEngine is based on Chromium version 53.0.2785.148, with
+    This version of Qt WebEngine is based on Chromium version 56.0.2924.122, 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 06a4a53a9..2eeda6e8a 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -114,17 +114,18 @@
 
     \section1 Mac App Store Compatibility
 
-    By default, Qt WebEngine uses private \macos API, which might cause an application to be
-    rejected when submitted to the Mac App Store. To configure Qt WebEngine not to use these API
-    calls, Qt has to be reconfigured with the \c -appstore-compliant switch.
-
-    However, this will cause some behavioral changes, such as:
+    Applications using Qt WebEngine are not compatible with the Mac App Store, because:
 
     \list
-        \li The \macos Kill Ring functionality will no longer work (emacs-like copy pasting).
-        \li Certain Chromium sandboxing cleanup is not done.
-        \li Text areas will be painted with a different style.
-        \li Text fields might be painted with a different style on Mountain Lion (\macos 10.8).
+        \li The Chromium part of the code uses several private API methods, which are prohibited by
+            the App Store.
+        \li Applications submitted to the App Store must be code-signed with the App Sandbox feature
+            enabled. The App Sandbox feature interferes with Chromium's own sandbox
+            initialization, which results in Chromium not being properly initialized. This also
+            ties in with the private API usage. Furthermore, standalone Chromium itself is not
+            officially tested with the App Sandbox enabled, and even if work is done to bypass
+            the App Store's restrictions, that would not guarantee correct behavior of the library.
+
     \endlist
 
     \section1 macOS Airplay Support on MacBooks with Dual GPUs
@@ -161,4 +162,24 @@
     set to 1 or alternatively the \c{--no-sandbox} command line argument can be passed to the user
     application executable.
 
+    \section1 Accessibility and Performance
+
+    Qt WebEngine enables accessibility support for web pages when the following conditions
+    are met:
+
+    \list
+        \li Qt Core is configured and built with accessibility support enabled.
+        \li The QPA plugin is notified by the operating system that accessibility should be
+            activated. This happens for example when using a screen reader application on Windows
+            or VoiceOver on \macos.
+    \endlist
+
+    Due to some limitations, the Linux QPA plugin almost always reports that accessibility should
+    be activated. On big HTML pages, this can cause a significant slowdown in rendering speed.
+
+    Because of that, from Qt 5.9 onwards, Qt WebEngine accessibility support is disabled by default
+    on Linux.
+    It can be re-enabled by setting the \c QTWEBENGINE_ENABLE_LINUX_ACCESSIBILITY environment
+    variable to a non-empty value.
+
 */
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index 4a47a49eb..6cc496d5b 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -50,6 +50,7 @@
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QQmlProperty>
+#include <QQuickWindow>
 #include <QCursor>
 #include <QList>
 #include <QScreen>
@@ -559,7 +560,11 @@ void UIDelegatesManager::showToolTip(const QString &text)
     int width = QQmlProperty(m_toolTip.data(), QStringLiteral("width")).read().toInt();
     QSize toolTipSize(width, height);
     QPoint position = m_view->cursor().pos();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
     position = m_view->mapFromGlobal(calculateToolTipPosition(position, toolTipSize)).toPoint();
+#else
+    position = m_view->window()->mapFromGlobal(calculateToolTipPosition(position, toolTipSize));
+#endif
 
     QQmlProperty(m_toolTip.data(), QStringLiteral("x")).write(position.x());
     QQmlProperty(m_toolTip.data(), QStringLiteral("y")).write(position.y());