diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-04 14:24:03 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-04 14:24:03 +0100 |
| commit | 14430b465d39a602d917f2a701218ed56360dc4e (patch) | |
| tree | a05f4aadf195a3f78843fe9709e237ed06d98994 /src/webenginewidgets | |
| parent | 10cd4401b9e4e9fde2a8e17c70a0d11d2dfc306f (diff) | |
| parent | 215fe3b16d35f3a597658fd378d35bdb56116267 (diff) | |
Merge branch '5.5' into 5.6
Change-Id: Ibc8ec5ab77ef27bede6e4af1e6318378ac6b9899
Diffstat (limited to 'src/webenginewidgets')
| -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 93e229db8..acce76910 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -861,7 +861,7 @@ bool QWebEnginePage::event(QEvent *e) bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData &data) { - if (!view) + if (!view || !view->d_func()->m_pendingContextMenuEvent) return false; m_menuData = WebEngineContextMenuData(); @@ -887,7 +887,6 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData return false; break; } - Q_ASSERT(view->d_func()->m_pendingContextMenuEvent); view->d_func()->m_pendingContextMenuEvent = false; return true; } |