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

Change-Id: Ibc1c881a67bf088ba6fb044e2553c74c7e9e24ca

1 files changed, 8 insertions, 2 deletions

diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index 0037f7e50..9b3f62217 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -315,9 +315,15 @@ void QWebEngineView::setZoomFactor(qreal factor)
  */
 bool QWebEngineView::event(QEvent *ev)
 {
-    // We swallow spontaneous contextMenu events and synthethize those back later on when we get the
-    // HandleContextMenu callback from chromium
     if (ev->type() == QEvent::ContextMenu) {
+        if (contextMenuPolicy() == Qt::NoContextMenu) {
+            // We forward the contextMenu event to the parent widget
+            ev->ignore();
+            return false;
+        }
+
+        // We swallow spontaneous contextMenu events and synthethize those back later on when we get the
+        // HandleContextMenu callback from chromium
         ev->accept();
         return true;
     }