diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-01-16 18:20:32 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 17:03:28 +0200 |
commit | beb4ff332ca5b8406a75e8b2146464c5b0a81abd (patch) | |
tree | cb949f8710876153acaa146eda29abf89447a9f4 /tests/auto/widgets/qwebenginepage | |
parent | 84ced937a0f9f2874e32e16c4c6ebf72b46904c9 (diff) |
Cleanup the QtWebEngineWidgets public headers and API
Headers were left intact to leave a trace of the evolution compared
to the QtWebKit API and to make it easier to work until we had a
basic subset of the API implemented.
With the upcoming release, this patch removes this convenience in the
aim of starting polishing the headers and the documentation for the
upcoming release.
Change-Id: Iae436b4ec041d771a7002575e122835802bc9f3e
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'tests/auto/widgets/qwebenginepage')
-rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index edfe2153b..c22ea0051 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -237,6 +237,7 @@ void tst_QWebEnginePage::cleanupTestCase() cleanupFiles(); // Be nice } +#if defined(QWEBENGINEPAGE_ACCEPTNAVIGATIONREQUEST) class NavigationRequestOverride : public QWebEnginePage { public: @@ -252,6 +253,7 @@ protected: return m_acceptNavigationRequest; } }; +#endif void tst_QWebEnginePage::acceptNavigationRequest() { @@ -434,15 +436,13 @@ public: connect(this, SIGNAL(geometryChangeRequested(QRect)), this, SLOT(slotGeometryChangeRequested(QRect))); } +#if defined(QWEBENGINEPAGE_ACCEPTNAVIGATIONREQUEST) struct Navigation { QWebEngineFrame *frame; QNetworkRequest request; NavigationType type; }; - QList<Navigation> navigations; - QList<TestPage*> createdWindows; - QRect requestedGeometry; virtual bool acceptNavigationRequest(QWebEngineFrame* frame, const QNetworkRequest &request, NavigationType type) { Navigation n; @@ -452,13 +452,16 @@ public: navigations.append(n); return true; } +#endif + QList<TestPage*> createdWindows; virtual QWebEnginePage* createWindow(WebWindowType) { TestPage* page = new TestPage(this); createdWindows.append(page); return page; } + QRect requestedGeometry; private Q_SLOTS: void slotGeometryChangeRequested(const QRect& geom) { requestedGeometry = geom; |