diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:40:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-31 13:10:16 +0000 |
| commit | b987250dc87bc64c735e9936e8cf847cde341f40 (patch) | |
| tree | 66d0d6dc8d918336eac93565cc2de3643062c3af /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | 3af17048cbd64fff17eedc340571e7555ea9790a (diff) | |
| parent | d2d5d24f86f12a2d1b0a6bc46c0d48306d7d2130 (diff) | |
| download | qtwebengine-b987250dc87bc64c735e9936e8cf847cde341f40.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 0e7f02f16..04b8a2b6f 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1269,6 +1269,15 @@ void QWebEnginePagePrivate::startDragging(const content::DropData &dropData, adapter->startDragging(view, dropData, allowedActions, pixmap, offset); } +bool QWebEnginePagePrivate::isEnabled() const +{ + const Q_Q(QWebEnginePage); + const QWidget *view = q->view(); + if (view) + return view->isEnabled(); + return true; +} + QMenu *QWebEnginePage::createStandardContextMenu() { Q_D(QWebEnginePage); |