diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-08-02 10:16:37 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-08-09 09:39:51 +0000 |
| commit | e50fb187dc4467ac28a724e6ea9f2d51a1f131ba (patch) | |
| tree | 64568413644a7b9ff627b6a06a1fd3a8d78373c9 /tests | |
| parent | 34a7c2cde9ea3fb2d4c297d60a4e16c9d99cdf9b (diff) | |
Fix origin test to compile without websockets
Change-Id: I7dc0ed033b3b99e633802d92176aca6f672d89e0
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/origins/origins.pro | 6 | ||||
| -rw-r--r-- | tests/auto/widgets/origins/tst_origins.cpp | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/widgets/origins/origins.pro b/tests/auto/widgets/origins/origins.pro index b569547d0..f77b3d59b 100644 --- a/tests/auto/widgets/origins/origins.pro +++ b/tests/auto/widgets/origins/origins.pro @@ -1,3 +1,7 @@ include(../tests.pri) CONFIG += c++14 -QT += websockets +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 19353e8bf..652d85ff0 100644 --- a/tests/auto/widgets/origins/tst_origins.cpp +++ b/tests/auto/widgets/origins/tst_origins.cpp @@ -37,8 +37,10 @@ #include <QtWebEngineWidgets/qwebengineprofile.h> #include <QtWebEngineWidgets/qwebenginesettings.h> #include <QtWebChannel/qwebchannel.h> +#if defined(WEBSOCKETS) #include <QtWebSockets/qwebsocket.h> #include <QtWebSockets/qwebsocketserver.h> +#endif #include <QtWidgets/qaction.h> #define QSL QStringLiteral @@ -175,7 +177,9 @@ private Q_SLOTS: void subdirWithoutAccess(); void mixedSchemes(); void mixedSchemesWithCsp(); +#if defined(WEBSOCKETS) void webSocket(); +#endif void dedicatedWorker(); void sharedWorker(); void serviceWorker(); @@ -474,6 +478,7 @@ void tst_Origins::mixedSchemesWithCsp() QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("canLoadButNotAccess"))); } +#if defined(WEBSOCKETS) class EchoServer : public QObject { Q_OBJECT Q_PROPERTY(QUrl url READ url NOTIFY urlChanged) @@ -542,7 +547,7 @@ void tst_Origins::webSocket() QVERIFY(load(QSL("PathSyntax:/resources/websocket.html"))); QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("ok"))); } - +#endif // Create a (Dedicated)Worker. Since dedicated workers can only be accessed from // one page, there is not much need for security restrictions. void tst_Origins::dedicatedWorker() |