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

 Conflicts:
	src/3rdparty
	tests/auto/quick/qmltests/qmltests.pro
	tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp

Change-Id: I2a1e3a83e29a1d6709f3e98fda3f7b4ab7ab297e

4 files changed, 38 insertions, 3 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index f5d3646d8..addb7d6df 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -338,7 +338,7 @@ void QQuickWebEngineViewPrivate::navigationRequested(int navigationType, const Q
     Q_EMIT q->navigationRequested(&navigationRequest);
 
     navigationRequestAction = navigationRequest.action();
-    if ((navigationRequestAction == WebContentsAdapterClient::AcceptRequest) && adapter)
+    if ((navigationRequestAction == WebContentsAdapterClient::AcceptRequest) && adapter && adapter->isFindTextInProgress())
         adapter->stopFinding();
 }
 
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 0e06ddbce..0a31811d9 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -316,6 +316,11 @@ void RenderWidgetHostViewQtDelegateQuick::hoverMoveEvent(QHoverEvent *event)
     m_client->forwardEvent(event);
 }
 
+void RenderWidgetHostViewQtDelegateQuick::hoverLeaveEvent(QHoverEvent *event)
+{
+    m_client->forwardEvent(event);
+}
+
 QVariant RenderWidgetHostViewQtDelegateQuick::inputMethodQuery(Qt::InputMethodQuery query) const
 {
     return m_client->inputMethodQuery(query);
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
index d93fd539a..7426dc16d 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -90,6 +90,7 @@ protected:
     virtual void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
     virtual void touchEvent(QTouchEvent *event) Q_DECL_OVERRIDE;
     virtual void hoverMoveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
+    virtual void hoverLeaveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
     virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
     virtual void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE;
     virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index 43e6e8817..fb23f5db7 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -257,7 +257,7 @@ QObject *UIDelegatesManager::addMenu(QObject *parentMenu, const QString &title,
     if (!title.isEmpty())
         QQmlProperty(menu, QStringLiteral("title")).write(title);
     if (!pos.isNull())
-        QQmlProperty(menu, QStringLiteral("pos")).write(pos);
+        menu->setProperty("pos", pos);
 
     menu->setParent(parentMenu);
 
@@ -496,9 +496,38 @@ void UIDelegatesManager::showFilePicker(QSharedPointer<FilePickerController> con
     QMetaObject::invokeMethod(filePicker, "open");
 }
 
+class TemporaryCursorMove
+{
+public:
+    TemporaryCursorMove(const QQuickItem *item, const QPoint &pos)
+    {
+        if (pos.isNull() || !item->contains(pos))
+            return;
+        const QPoint oldPos = QCursor::pos();
+        const QPoint globalPos = item->mapToGlobal(QPointF(pos)).toPoint();
+        if (oldPos == globalPos)
+            return;
+        m_oldCursorPos = oldPos;
+        QCursor::setPos(globalPos);
+    }
+
+    ~TemporaryCursorMove()
+    {
+        if (!m_oldCursorPos.isNull())
+            QCursor::setPos(m_oldCursorPos);
+    }
+
+private:
+    QPoint m_oldCursorPos;
+};
+
 void UIDelegatesManager::showMenu(QObject *menu)
 {
-     QMetaObject::invokeMethod(menu, "popup");
+    // QtQuick.Controls.Menu.popup() always shows the menu under the mouse cursor, i.e. the menu's
+    // position we set above is ignored. Work around the problem by moving the mouse cursor
+    // temporarily to the right position.
+    TemporaryCursorMove tcm(m_view, menu->property("pos").toPoint());
+    QMetaObject::invokeMethod(menu, "popup");
 }
 
 void UIDelegatesManager::showMessageBubble(const QRect &anchor, const QString &mainText, const QString &subText)