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

Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61

5 files changed, 16 insertions, 3 deletions

diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index 162dbe1d7..f22ec86a4 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -336,7 +336,7 @@ QQuickWebEngineProfile::~QQuickWebEngineProfile()
     The storage name that is used to create separate subdirectories for each profile that uses
     the disk for storing persistent data and cache.
 
-    \sa QQuickWebEngineProfile::persistentStoragePath, QQuickWebEngineProfile::cachePath
+    \sa persistentStoragePath, cachePath
 */
 
 QString QQuickWebEngineProfile::storageName() const
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 2db25584c..1cc0969ef 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -881,6 +881,8 @@ QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent)
 QQuickWebEngineView::~QQuickWebEngineView()
 {
     Q_D(QQuickWebEngineView);
+    if (d->adapter)
+        d->adapter->stopFinding();
     if (d->faviconProvider)
         d->faviconProvider->detach(this);
 }
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index 615e3eed0..851507659 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -131,6 +131,13 @@
         \li Text fields might be painted with a different style on Mountain Lion (\macos 10.8).
     \endlist
 
+    \section1 macOS Airplay Support on MacBooks with Dual GPUs
+
+    To make Qt WebEngine work correctly when streaming to an AppleTV from a MacBook that supports
+    GPU switching, it is important to add the \c NSSupportsAutomaticGraphicsSwitching option to the
+    application Info.plist file, with the value set to \c YES. Otherwise rendering issues might
+    occur when creating new web engine view instances after Airplay is switched on or off.
+
     \section1 Default QSurfaceFormat OpenGL Profile Support
 
     If a new default QSurfaceFormat with a modified OpenGL profile has to be set, it should be set
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index f79b0ca22..4e4fc406f 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -323,7 +323,8 @@ void RenderWidgetHostViewQtDelegateQuick::touchEvent(QTouchEvent *event)
 void RenderWidgetHostViewQtDelegateQuick::hoverMoveEvent(QHoverEvent *event)
 {
     QQuickItem *parent = parentItem();
-    if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+    if ((!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool()
+         && !parent->hasActiveFocus()) || event->posF() == event->oldPosF()) {
         event->ignore();
         return;
     }
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index a37484023..4a47a49eb 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -330,7 +330,10 @@ void UIDelegatesManager::showDialog(QSharedPointer<JavaScriptDialogController> d
         item->setParentItem(m_view);
     dialog->setParent(m_view);
     QQmlProperty textProp(dialog, QStringLiteral("text"));
-    textProp.write(dialogController->message());
+    if (dialogController->type() == WebContentsAdapterClient::UnloadDialog)
+        textProp.write(tr("Changes that you made may not be saved."));
+    else
+        textProp.write(dialogController->message());
 
     QQmlProperty titleProp(dialog, QStringLiteral("title"));
     titleProp.write(title);