diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-10-29 12:01:11 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-10-29 12:27:15 +0000 |
| commit | 9ec4353648b549de6f95386ca18aafb2732a6a19 (patch) | |
| tree | 6cd3042e07d5428a340d7288ad10c31575f6f47f | |
| parent | b27161b6057295e43d5a45646a8cf22d4aefa18e (diff) | |
Do not display context menu when pending event flag is false.
When an event filter is installed on the view, the right
mouse click event may trigger Chromium to request a context
menu even though the context menu events get filtered out.
Removes a Q_ASSERT that would now never be triggered.
Change-Id: I3ff496ec4e4ecbb4faa107f7e221765918c5fa06
Task-number: QTBUG-49092
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 6207a2b30..bb8babd7a 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -700,7 +700,7 @@ bool QWebEnginePage::event(QEvent *e) bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData &data) { - if (!view) + if (!view || !view->d_func()->m_pendingContextMenuEvent) return false; QContextMenuEvent event(QContextMenuEvent::Mouse, data.pos, view->mapToGlobal(data.pos)); @@ -725,7 +725,6 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData return false; break; } - Q_ASSERT(view->d_func()->m_pendingContextMenuEvent); view->d_func()->m_pendingContextMenuEvent = false; m_menuData = WebEngineContextMenuData(); return true; |