summaryrefslogtreecommitdiff
path: root/src/webenginewidgets/api/qwebenginepage.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-11-05 14:32:25 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-11-05 14:32:25 +0000
commit09018b99dce7a8ed43b0842055e8775d5021cf04 (patch)
tree8ab6f1b450eb63f981f9275c0f973695d5a3f7b7 /src/webenginewidgets/api/qwebenginepage.cpp
parenta5e14c7abf8fddfbcbc3223e093f8acb50c459d5 (diff)
parent14430b465d39a602d917f2a701218ed56360dc4e (diff)
downloadqtwebengine-09018b99dce7a8ed43b0842055e8775d5021cf04.tar.gz
Merge "Merge branch '5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
-rw-r--r--src/webenginewidgets/api/qwebenginepage.cpp3
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;
}