diff options
Diffstat (limited to 'tests')
4 files changed, 14 insertions, 10 deletions
diff --git a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp index f92474d05..86261721c 100644 --- a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp +++ b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp @@ -318,14 +318,12 @@ void tst_QWebEngineHistory::serialize_3() //prepare two different history items QWebEngineHistoryItem a = hist->currentItem(); - a.setUserData("A - user data"); //check properties BEFORE serialization QString title(a.title()); QDateTime lastVisited(a.lastVisited()); QUrl originalUrl(a.originalUrl()); QUrl url(a.url()); - QVariant userData(a.userData()); save << *hist; QVERIFY(save.status() == QDataStream::Ok); @@ -341,7 +339,6 @@ void tst_QWebEngineHistory::serialize_3() QCOMPARE(b.lastVisited(), lastVisited); QCOMPARE(b.originalUrl(), originalUrl); QCOMPARE(b.url(), url); - QCOMPARE(b.userData(), userData); //Check if all data was read QVERIFY(load.atEnd()); @@ -480,9 +477,6 @@ void tst_QWebEngineHistory::historyItemFromDeletedPage() QCOMPARE(item.url(), QUrl()); QCOMPARE(item.title(), QString()); QCOMPARE(item.lastVisited(), QDateTime()); - QCOMPARE(item.icon(), QIcon()); - item.setUserData(42); - QCOMPARE(item.userData(), QVariant()); } } diff --git a/tests/auto/widgets/qwebenginehistoryinterface/tst_qwebenginehistoryinterface.cpp b/tests/auto/widgets/qwebenginehistoryinterface/tst_qwebenginehistoryinterface.cpp index 180a0f2fe..93714255b 100644 --- a/tests/auto/widgets/qwebenginehistoryinterface/tst_qwebenginehistoryinterface.cpp +++ b/tests/auto/widgets/qwebenginehistoryinterface/tst_qwebenginehistoryinterface.cpp @@ -22,7 +22,9 @@ #include <qwebenginepage.h> #include <qwebengineview.h> +#if defined(QWEBENGINEHISTORYINTERFACE) #include <qwebenginehistoryinterface.h> +#endif #include <QDebug> class tst_QWebEngineHistoryInterface : public QObject @@ -73,6 +75,7 @@ void tst_QWebEngineHistoryInterface::cleanup() delete m_view; } +#if defined(QWEBENGINEHISTORYINTERFACE) class FakeHistoryImplementation : public QWebEngineHistoryInterface { public: void addHistoryEntry(const QString&) {} @@ -80,7 +83,7 @@ public: return url == QLatin1String("http://www.trolltech.com/"); } }; - +#endif /* * Test that visited links are properly colored. http://www.trolltech.com is marked diff --git a/tests/auto/widgets/qwebengineinspector/tst_qwebengineinspector.cpp b/tests/auto/widgets/qwebengineinspector/tst_qwebengineinspector.cpp index 5da386380..8d7e41f0f 100644 --- a/tests/auto/widgets/qwebengineinspector/tst_qwebengineinspector.cpp +++ b/tests/auto/widgets/qwebengineinspector/tst_qwebengineinspector.cpp @@ -20,9 +20,13 @@ #include <QtTest/QtTest> #include <qdir.h> +#if defined(QWEBENGINEINSPECTOR) #include <qwebengineinspector.h> +#endif #include <qwebenginepage.h> +#if defined(QWEBENGINESETTINGS) #include <qwebenginesettings.h> +#endif class tst_QWebEngineInspector : public QObject { Q_OBJECT 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; |