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

 Conflicts:
	.qmake.conf
	src/webengine/api/qquickwebengineview_p_p.h
	src/webenginewidgets/api/qwebenginepage_p.h
	tests/auto/quick/qmltests/data/TestWebEngineView.qml

Change-Id: Id2acc92e8d0364bdaaf5a63ea2d2cb9cd533ade3

1 files changed, 3 insertions, 4 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 2721039ae..2c30627ad 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -183,7 +183,7 @@ RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHo
     return quickDelegate;
 }
 
-bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenuData &data)
+void QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenuData &data)
 {
     Q_Q(QQuickWebEngineView);
 
@@ -195,13 +195,13 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
     Q_EMIT q->contextMenuRequested(request);
 
     if (request->isAccepted())
-        return true;
+        return;
 
     // Assign the WebEngineView as the parent of the menu, so mouse events are properly propagated
     // on OSX.
     QObject *menu = ui()->addMenu(q, QString(), data.position());
     if (!menu)
-        return false;
+        return;
 
     // Populate our menu
     MenuItemHandler *item = 0;
@@ -329,7 +329,6 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
 
     // Now fire the popup() method on the top level menu
     ui()->showMenu(menu);
-    return true;
 }
 
 void QQuickWebEngineViewPrivate::navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame)