diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-17 12:51:21 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-17 12:51:21 +0100 |
| commit | 2c6e6b86ef0a6c63297f9d5daa41c294aaf31a9b (patch) | |
| tree | a8bcb1c7cb5aaf8194eab09f8bc56b2659f13ea5 /src/webenginewidgets/api/qwebenginepage_p.h | |
| parent | aa527a2e553bea0514bc088bfc09105703fe87ba (diff) | |
| parent | 819e00f71e37f5230b9b2c2ff756db4cc4cfda5e (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
src/webengine/api/qquickwebengineview_p_p.h
src/webenginewidgets/api/qwebenginepage_p.h
tests/auto/quick/qmltests/data/TestWebEngineView.qml
Change-Id: Id2acc92e8d0364bdaaf5a63ea2d2cb9cd533ade3
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage_p.h')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index 66f479717..270849aee 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -109,7 +109,7 @@ public: bool isBeingAdopted() override; void close() override; void windowCloseRejected() override; - bool contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &data) override; + void contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &data) override; void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) override; void requestFullScreenMode(const QUrl &origin, bool fullscreen) override; bool isFullScreenMode() const override; @@ -135,8 +135,7 @@ public: void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) override; void hideValidationMessage() override; void moveValidationMessage(const QRect &anchor) override; - virtual void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, - int exitCode) override; + void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode) override; void requestGeometryChange(const QRect &geometry, const QRect &frameGeometry) override; void updateScrollPosition(const QPointF &position) override; void updateContentsSize(const QSizeF &size) override; |