diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 51456128f82aa3d7b19147b478b4401137648316..70f5984c7dc0a8583318b195231db323d395a5b4 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1397,7 +1397,7 @@ void QWebEnginePagePrivate::wasHidden() bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData &data) { - if (!view || !view->d_func()->m_pendingContextMenuEvent) + if (!view) return false; contextData.reset(); @@ -1423,7 +1423,6 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData event.ignore(); return false; } - view->d_func()->m_pendingContextMenuEvent = false; return true; } diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 56948bb18a9d5ba7768c798ae36237e0bb8d1413..0037f7e5001c7febfbbf155f202330b7f947116e 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -106,7 +106,6 @@ static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *obje QWebEngineViewPrivate::QWebEngineViewPrivate() : page(0) - , m_pendingContextMenuEvent(false) , m_dragEntered(false) { #ifndef QT_NO_ACCESSIBILITY @@ -316,12 +315,10 @@ void QWebEngineView::setZoomFactor(qreal factor) */ bool QWebEngineView::event(QEvent *ev) { - Q_D(QWebEngineView); // We swallow spontaneous contextMenu events and synthethize those back later on when we get the // HandleContextMenu callback from chromium if (ev->type() == QEvent::ContextMenu) { ev->accept(); - d->m_pendingContextMenuEvent = true; return true; } return QWidget::event(ev); diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h index 45b3e266eb0668c93cfc92baa8e36ae13162b536..f3a37225b619b42a1eb2054134d7249bf2f028c5 100644 --- a/src/webenginewidgets/api/qwebengineview_p.h +++ b/src/webenginewidgets/api/qwebengineview_p.h @@ -70,7 +70,6 @@ public: QWebEngineViewPrivate(); QWebEnginePage *page; - bool m_pendingContextMenuEvent; bool m_dragEntered; };