diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-23 17:56:57 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-23 17:57:59 +0200 |
| commit | bb2e06f828c2169f6853a7e8fd29b138bb469fe3 (patch) | |
| tree | 79ec99f41ccce75bc8b8fa11a25365b502fe520e /src/webenginewidgets/api/qwebenginepage.h | |
| parent | 2ba0e25a0c6fee7e2144f1fc8b577f73e1155e6d (diff) | |
| parent | a626e0e3ff1ab160855c7deee283d8eb004d47ce (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I6f913ebc7aed68d4b8c3f8666fd2389607b491b7
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.h')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index 63892d197..4414ed1d5 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -125,7 +125,7 @@ public: FindBackward = 1, FindCaseSensitively = 2, }; - Q_DECLARE_FLAGS(FindFlags, FindFlag); + Q_DECLARE_FLAGS(FindFlags, FindFlag) enum WebWindowType { WebBrowserWindow, @@ -270,7 +270,7 @@ protected: virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame); private: - Q_DECLARE_PRIVATE(QWebEnginePage); + Q_DECLARE_PRIVATE(QWebEnginePage) QScopedPointer<QWebEnginePagePrivate> d_ptr; #ifndef QT_NO_ACTION Q_PRIVATE_SLOT(d_func(), void _q_webActionTriggered(bool checked)) |