diff options
Diffstat (limited to 'tests')
4 files changed, 20 insertions, 10 deletions
diff --git a/tests/auto/widgets/origins/origins.pro b/tests/auto/widgets/origins/origins.pro index f77b3d59b..7498354de 100644 --- a/tests/auto/widgets/origins/origins.pro +++ b/tests/auto/widgets/origins/origins.pro @@ -1,6 +1,6 @@ include(../tests.pri) CONFIG += c++14 -qtHaveModule(websockets) { +qtConfig(webengine-webchannel):qtHaveModule(websockets) { QT += websockets DEFINES += WEBSOCKETS } diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp index 652d85ff0..364c83c3e 100644 --- a/tests/auto/widgets/origins/tst_origins.cpp +++ b/tests/auto/widgets/origins/tst_origins.cpp @@ -36,10 +36,10 @@ #include <QtWebEngineWidgets/qwebenginepage.h> #include <QtWebEngineWidgets/qwebengineprofile.h> #include <QtWebEngineWidgets/qwebenginesettings.h> -#include <QtWebChannel/qwebchannel.h> #if defined(WEBSOCKETS) #include <QtWebSockets/qwebsocket.h> #include <QtWebSockets/qwebsocketserver.h> +#include <QtWebChannel/qwebchannel.h> #endif #include <QtWidgets/qaction.h> diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 4ce971c4b..95a46fbc2 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -20,6 +20,7 @@ */ #include "../util.h" +#include <QtWebEngineCore/qtwebenginecore-config.h> #include <QByteArray> #include <QClipboard> #include <QDir> @@ -39,7 +40,9 @@ #include <QtGui/QClipboard> #include <QtTest/QtTest> #include <QTextCharFormat> +#if QT_CONFIG(webengine_webchannel) #include <QWebChannel> +#endif #include <httpserver.h> #include <qnetworkcookiejar.h> #include <qnetworkreply.h> @@ -200,8 +203,9 @@ private Q_SLOTS: void loadInSignalHandlers_data(); void loadInSignalHandlers(); void loadFromQrc(); - +#if QT_CONFIG(webengine_webchannel) void restoreHistory(); +#endif void toPlainTextLoadFinishedRace_data(); void toPlainTextLoadFinishedRace(); void setZoomFactor(); @@ -3950,6 +3954,7 @@ void tst_QWebEnginePage::loadFromQrc() QCOMPARE(spy.takeFirst().value(0).toBool(), false); } +#if QT_CONFIG(webengine_webchannel) void tst_QWebEnginePage::restoreHistory() { QWebChannel channel; @@ -3977,6 +3982,7 @@ void tst_QWebEnginePage::restoreHistory() QCOMPARE(page.webChannel(), &channel); QVERIFY(page.scripts().contains(script)); } +#endif void tst_QWebEnginePage::toPlainTextLoadFinishedRace_data() { diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp index 23d31a478..f4e1baa33 100644 --- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp +++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp @@ -18,14 +18,16 @@ */ #include <QtTest/QtTest> - +#include <QtWebEngineCore/qtwebenginecore-config.h> #include <qwebenginepage.h> #include <qwebengineprofile.h> #include <qwebenginescript.h> #include <qwebenginescriptcollection.h> #include <qwebengineview.h> #include "../util.h" +#if QT_CONFIG(webengine_webchannel) #include <QWebChannel> +#endif class tst_QWebEngineScript: public QObject { Q_OBJECT @@ -35,14 +37,16 @@ private Q_SLOTS: void loadEvents(); void scriptWorld(); void scriptModifications(); +#if QT_CONFIG(webengine_webchannel) void webChannel_data(); void webChannel(); - void noTransportWithoutWebChannel(); - void scriptsInNestedIframes(); void webChannelResettingAndUnsetting(); void webChannelWithExistingQtObject(); void navigation(); void webChannelWithBadString(); +#endif + void noTransportWithoutWebChannel(); + void scriptsInNestedIframes(); }; void tst_QWebEngineScript::domEditing() @@ -273,7 +277,7 @@ static QWebEngineScript webChannelScript() script.setWorldId(QWebEngineScript::MainWorld); return script; } - +#if QT_CONFIG(webengine_webchannel) void tst_QWebEngineScript::webChannel_data() { QTest::addColumn<int>("worldId"); @@ -318,7 +322,7 @@ void tst_QWebEngineScript::webChannel() if (worldId != QWebEngineScript::MainWorld) QCOMPARE(evaluateJavaScriptSync(&page, "qt.webChannelTransport"), QVariant(QVariant::Invalid)); } - +#endif void tst_QWebEngineScript::noTransportWithoutWebChannel() { QWebEnginePage page; @@ -382,7 +386,7 @@ void tst_QWebEngineScript::scriptsInNestedIframes() QWebEngineScript::ApplicationWorld), QVariant::fromValue(QStringLiteral("Modified Inner text"))); } - +#if QT_CONFIG(webengine_webchannel) void tst_QWebEngineScript::webChannelResettingAndUnsetting() { QWebEnginePage page; @@ -485,7 +489,7 @@ void tst_QWebEngineScript::webChannelWithBadString() QVERIFY(hostSpy.wait(20000)); QCOMPARE(host.text(), QString(QChar(QChar::ReplacementCharacter))); } - +#endif QTEST_MAIN(tst_QWebEngineScript) #include "tst_qwebenginescript.moc" |