diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-02-02 08:43:05 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-02-03 13:37:42 +0100 |
| commit | 48d2066d6c9b38f29368e5205a5b7f49ab3fa857 (patch) | |
| tree | c40f1f840b7450248e1a0549c0caa75b6d536dd9 /tests/auto/qml | |
| parent | 165ecd37b44e6c96c0e85afc5ea4a1bc392e035e (diff) | |
| download | qtwebchannel-48d2066d6c9b38f29368e5205a5b7f49ab3fa857.tar.gz | |
Fix project structure and auto registry
Create QtWebChannelQuick and move the required sources,
so auto registry works and qml types files and friends
are auto generated. This makes things inline what other
modules do.
This change has a side effect as qqmlwebchannel.h
will change its module, however this is semi-pulibc
header, hopefully only used by QtWebEngine.
[ChangeLog] Created new QtWebChannelQuick which holds
qml sources.
Task-number: QTBUG-110795
Fixes: QTBUG-99959
Change-Id: Ic8aa72f070d6a9e23d918a1210f4df62df739397
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/qml')
| -rw-r--r-- | tests/auto/qml/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tests/auto/qml/testwebchannel.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qml/testwebchannel.h | 2 |
3 files changed, 5 insertions, 15 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 |