5 files changed, 8 insertions, 29 deletions
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index eaac420..3fc18ff 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -1,11 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qml.pro.
-
-#####################################################################
-## qml Test:
-#####################################################################
 
 # Collect test data
 file(GLOB_RECURSE test_data_glob
@@ -13,7 +8,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_internal_add_test(tst_qmlwebchannel    # special case
+qt_internal_add_test(tst_qmlwebchannel
     QMLTEST
     QML_IMPORTPATH
         "${CMAKE_CURRENT_BINARY_DIR}/../../../qml"
@@ -25,13 +20,8 @@ qt_internal_add_test(tst_qmlwebchannel    # special case
         testwebchannel.cpp testwebchannel.h
     LIBRARIES
         Qt::CorePrivate
-        Qt::Gui
         Qt::WebChannelPrivate
+        Qt::WebChannelQuick
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
-# DISTFILES = "tst_webchannelseparation.qml"
-# IMPORTPATH = "$$OUT_PWD/../../../qml" "$$PWD"
-# OTHER_FILES = "Client.qml" "WebChannelTest.qml" "tst_webchannel.qml" "tst_metaobjectpublisher.qml" "tst_bench.qml" "tst_multiclient.qml"
-# TEMPLATE = "app"
diff --git a/tests/auto/qml/testwebchannel.cpp b/tests/auto/qml/testwebchannel.cpp
index a353c50..e2f7b20 100644
--- a/tests/auto/qml/testwebchannel.cpp
+++ b/tests/auto/qml/testwebchannel.cpp
@@ -3,8 +3,8 @@
 
 #include "testwebchannel.h"
 
-#include <private/qwebchannel_p.h>
-#include <private/qmetaobjectpublisher_p.h>
+#include <QtWebChannel/private/qwebchannel_p.h>
+#include <QtWebChannel/private/qmetaobjectpublisher_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/qml/testwebchannel.h b/tests/auto/qml/testwebchannel.h
index 4768f99..462e6de 100644
--- a/tests/auto/qml/testwebchannel.h
+++ b/tests/auto/qml/testwebchannel.h
@@ -4,7 +4,7 @@
 #ifndef TESTWEBCHANNEL_H
 #define TESTWEBCHANNEL_H
 
-#include <QtWebChannel/QQmlWebChannel>
+#include <QtWebChannelQuick/qqmlwebchannel.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/webchannel/CMakeLists.txt b/tests/auto/webchannel/CMakeLists.txt
index 0dd4c31..ae747bb 100644
--- a/tests/auto/webchannel/CMakeLists.txt
+++ b/tests/auto/webchannel/CMakeLists.txt
@@ -1,25 +1,14 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from webchannel.pro.
-
-#####################################################################
-## tst_webchannel Test:
-#####################################################################
-
 qt_internal_add_test(tst_webchannel
     SOURCES
         tst_webchannel.cpp tst_webchannel.h
-    INCLUDE_DIRECTORIES
-        ../../../src/webchannel
     LIBRARIES
         Qt::CorePrivate
         Qt::WebChannelPrivate
 )
 
-## Scopes:
-#####################################################################
-
 qt_internal_extend_target(tst_webchannel CONDITION TARGET Qt::Qml
     DEFINES
         WEBCHANNEL_TESTS_CAN_USE_JS_ENGINE
diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index 28f1482..7bf04dd 100644
--- a/tests/auto/webchannel/tst_webchannel.cpp
+++ b/tests/auto/webchannel/tst_webchannel.cpp
@@ -4,9 +4,9 @@
 
 #include "tst_webchannel.h"
 
-#include <qwebchannel.h>
-#include <qwebchannel_p.h>
-#include <qmetaobjectpublisher_p.h>
+#include <QtWebChannel/qwebchannel.h>
+#include <QtWebChannel/private/qwebchannel_p.h>
+#include <QtWebChannel/private/qmetaobjectpublisher_p.h>
 
 #include <QtTest>
 #ifdef WEBCHANNEL_TESTS_CAN_USE_JS_ENGINE