From 29e1f870f6de53e0241c34123b6d674bb3ae3076 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 26 May 2021 08:43:27 +0200 Subject: Fix running of some webchannel/websockets tests Add missing WebSockets lookup, otherwise tst_origin is compiled without some tests. Fix compilation issues. Change-Id: I7688ac296477ce27d5cdc5c771e90f2ecd590ad8 Reviewed-by: Allan Sandfeld Jensen --- tests/CMakeLists.txt | 2 +- tests/auto/widgets/origins/tst_origins.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e7b2008d1..8d1f1a002 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -16,7 +16,7 @@ endif() find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets - WebEngineCore WebEngineWidgets WebEngineQuick QuickWidgets Test QuickTest) + WebEngineCore WebEngineWidgets WebEngineQuick QuickWidgets Test QuickTest WebSockets) if(NOT QT_BUILD_STANDALONE_TESTS) qt_build_repo_begin() diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp index a834110b5..a34404a7e 100644 --- a/tests/auto/widgets/origins/tst_origins.cpp +++ b/tests/auto/widgets/origins/tst_origins.cpp @@ -775,8 +775,8 @@ void tst_Origins::webSocket() m_page->setWebChannel(&channel); QVERIFY(echoServer.listen()); - QVERIFY(verifyLoad( - QSL("file:" QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() "/resources/websocket.html"))); + QVERIFY(verifyLoad("file:" + QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() + + "/resources/websocket.html")); QTRY_COMPARE(eval(QSL("result")), QVariant(QSL("ok"))); QVERIFY(verifyLoad(QSL("qrc:/resources/websocket.html"))); -- cgit v1.2.3