diff options
author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-02 16:44:55 +0100 |
---|---|---|
committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-21 19:45:44 +0100 |
commit | 8f7080fd0957fea3a67a255e5344ab125fa3c33f (patch) | |
tree | 4569ad2e2e1089212de2090c71ba4a52ef2e9522 /tests/auto/qml | |
parent | ba092a525d01ee028bea6da271ea4baf64a62095 (diff) |
Replace AUTO_RESOURCE_PREFIX with Qt CMake Policy in examples, tests
Every instance of AUTO_RESOURCE_PREFIX has been replaced by either
qt_standard_project_setup(REQUIRES 6.5) or with
qt_policy(SET QTP0001 NEW), mainly in tests.
In addition, I added a warning message for the case where
AUTO_RESOURCE_PREFIX is used.
Pick-to: 6.5
Task-number: QTBUG-96233
Change-Id: I323a15e9d0bb5fe6ba649365314af9fc2ad67bda
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Diffstat (limited to 'tests/auto/qml')
11 files changed, 24 insertions, 11 deletions
diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt index 0b60a0092b..a60bec4ee7 100644 --- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt +++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt @@ -17,11 +17,12 @@ qt_add_library(testCppTypes STATIC) qt_autogen_tools_initial_setup(testCppTypes) target_link_libraries(testCppTypes PRIVATE Qt::Qml Qt::QmlPrivate Qt::Quick) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(testCppTypes URI TestTypes SOURCES commontypes.h - AUTO_RESOURCE_PREFIX OUTPUT_DIRECTORY TestTypes ) qt_autogen_tools_initial_setup(testCppTypesplugin) diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt index e5c4c4468a..a2a5224014 100644 --- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt +++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt @@ -225,11 +225,12 @@ set_target_properties(codegen_test_module PROPERTIES QT_QMLCACHEGEN_EXECUTABLE qmlcachegen ) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(codegen_test_module VERSION 1.5 URI TestTypes IMPORT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/imports/" - AUTO_RESOURCE_PREFIX DEPENDENCIES QtQuick QtQuick.Templates diff --git a/tests/auto/qml/qmlsplitlib/CMakeLists.txt b/tests/auto/qml/qmlsplitlib/CMakeLists.txt index 523ab5cbfd..f9783941c2 100644 --- a/tests/auto/qml/qmlsplitlib/CMakeLists.txt +++ b/tests/auto/qml/qmlsplitlib/CMakeLists.txt @@ -24,9 +24,10 @@ qt_autogen_tools_initial_setup(tst_qmlsplitlib) qt6_generate_foreign_qml_types(tst_qmlsplitlib_library tst_qmlsplitlib) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(tst_qmlsplitlib URI "SplitLib" - AUTO_RESOURCE_PREFIX QML_FILES main.qml ) diff --git a/tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt b/tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt index f661cdea1e..daf1139a8f 100644 --- a/tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt +++ b/tests/auto/qml/qmltc/NamespaceTest/Subfolder/CMakeLists.txt @@ -24,9 +24,10 @@ qt_autogen_tools_initial_setup(qmltc_namespace_test_module) target_link_libraries(qmltc_namespace_test_module PUBLIC ${common_libraries}) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(qmltc_namespace_test_module URI NamespaceTest.Subfolder - AUTO_RESOURCE_PREFIX SOURCES ${cpp_sources} QML_FILES diff --git a/tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt b/tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt index 870d21f61d..7cf95b9b59 100644 --- a/tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt +++ b/tests/auto/qml/qmltc/QmltcTests/CMakeLists.txt @@ -166,10 +166,11 @@ qt_internal_add_resource(qmltc_test_module "qmake_immediate" ${qmake_immediate_resource_files} ) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(qmltc_test_module VERSION 1.0 URI QmltcTests - AUTO_RESOURCE_PREFIX SOURCES ${cpp_sources} QML_FILES diff --git a/tests/auto/qml/qmltc_manual/CMakeLists.txt b/tests/auto/qml/qmltc_manual/CMakeLists.txt index 8101bcbcea..15858492e9 100644 --- a/tests/auto/qml/qmltc_manual/CMakeLists.txt +++ b/tests/auto/qml/qmltc_manual/CMakeLists.txt @@ -19,9 +19,10 @@ qt_internal_add_test(tst_qmltc_manual TESTDATA ${test_data} ) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(tst_qmltc_manual URI "QmltcManualTests" - AUTO_RESOURCE_PREFIX QML_FILES ${test_data} ) diff --git a/tests/auto/qml/qmltc_qprocess/CMakeLists.txt b/tests/auto/qml/qmltc_qprocess/CMakeLists.txt index bac445dec8..c3590f73d1 100644 --- a/tests/auto/qml/qmltc_qprocess/CMakeLists.txt +++ b/tests/auto/qml/qmltc_qprocess/CMakeLists.txt @@ -14,10 +14,11 @@ qt_internal_add_test(tst_qmltc_qprocess set_source_files_properties(data/SingletonThing.qml data/singletonUncreatable.qml PROPERTIES QT_QML_SINGLETON_TYPE true) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(tst_qmltc_qprocess VERSION 1.0 URI QmltcQProcessTests - AUTO_RESOURCE_PREFIX SOURCES cpptypes/testtype.h DEPENDENCIES diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index 039f1647db..a0d26b733a 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -76,9 +76,11 @@ qt_add_library(tst-qmltyperegistrar-with-dashes) qt_autogen_tools_initial_setup(tst-qmltyperegistrar-with-dashes) target_link_libraries(tst-qmltyperegistrar-with-dashes PRIVATE Qt::Core Qt::Qml) qt_enable_autogen_tool(tst-qmltyperegistrar-with-dashes "moc" ON) + +qt_policy(SET QTP0001 NEW) + qt_add_qml_module(tst-qmltyperegistrar-with-dashes URI Module-With-Dashes - AUTO_RESOURCE_PREFIX SOURCES foo.cpp foo.h OUTPUT_DIRECTORY Module-With-Dashes diff --git a/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt index cb020e95e0..d469f1e97f 100644 --- a/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/UnregisteredTypes/CMakeLists.txt @@ -2,13 +2,15 @@ # SPDX-License-Identifier: BSD-3-Clause # Use NO_GENERATE_QMLTYPES to avoid static asserts during compilation of the types to be tested, same for NO_PLUGIN + +qt_policy(SET QTP0001 NEW) + qt_add_qml_module(UnregisteredTypes STATIC URI UnregisteredTypes NO_GENERATE_QMLTYPES NO_PLUGIN SOURCES uncreatable.h - AUTO_RESOURCE_PREFIX ) qt_enable_autogen_tool(UnregisteredTypes "moc" ON) diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt index cab87ac08d..2d3b7177ac 100644 --- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt +++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt @@ -36,10 +36,11 @@ if(TARGET Qt::QuickControls2) target_compile_definitions(tst_qqmlcomponent PRIVATE HAS_CONTROLS) endif() +qt_policy(SET QTP0001 NEW) + qt_add_qml_module( tst_qqmlcomponent URI test - AUTO_RESOURCE_PREFIX QML_FILES "data/TestComponentWithIC.qml" "data/withAot.qml" diff --git a/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt b/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt index 3431398f47..5215159373 100644 --- a/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt +++ b/tests/auto/qml/qqmljsscope/QQmlJSScopeTests/CMakeLists.txt @@ -8,9 +8,10 @@ qt_autogen_tools_initial_setup(qqmljsscope_test_module) target_include_directories(qqmljsscope_test_module PUBLIC cpptypes/) target_link_libraries(qqmljsscope_test_module PUBLIC Qt::Core Qt::Qml Qt::Gui) +qt_policy(SET QTP0001 NEW) + qt6_add_qml_module(qqmljsscope_test_module URI QQmlJSScopeTests - AUTO_RESOURCE_PREFIX SOURCES singleton.h singleton.cpp extensiontypes.h |