diff options
| author | Alexandru Croitor <[email protected]> | 2019-11-14 11:39:42 +0100 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2019-11-15 12:24:38 +0000 |
| commit | 91e32f86b53bb930405a58e19c84746ee85cdf89 (patch) | |
| tree | 3419986b62355e718551b83a514c1169480a8ed0 /tests/auto | |
| parent | 387f360b3b2634094889478f2b258e65a70b9aa6 (diff) | |
Regenerate remaining tests to be in sync
Change-Id: I200c8f58ad13bc1bc78409a3ce49348584ba5b51
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <[email protected]>
Diffstat (limited to 'tests/auto')
74 files changed, 478 insertions, 468 deletions
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt index 905d199505..e8b5fb59ff 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from dummy.pro. ##################################################################### -## Dummy Plugin: +## Dummy Generic Library: ##################################################################### -add_qt_plugin(Dummy +add_cmake_library(Dummy + MODULE SOURCES dummy.cpp dummy.h dummy_plugin.cpp dummy_plugin.h @@ -15,16 +16,14 @@ add_qt_plugin(Dummy ) #### Keys ignored in scope 1:.:.:dummy.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:dummy.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:dummy.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" # cp.path = "$$OUT_PWD" + +qt_autogen_tools_initial_setup(Dummy) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt index db6c8469e5..2278a7423f 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from dummy.pro. ##################################################################### -## Dummy Plugin: +## Dummy Generic Library: ##################################################################### -add_qt_plugin(Dummy -# special case begin - TYPE qml_plugin - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -# special case end +add_cmake_library(Dummy + MODULE + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES dummy.cpp dummy.h dummy_plugin.cpp dummy_plugin.h @@ -19,22 +17,20 @@ add_qt_plugin(Dummy ) #### Keys ignored in scope 1:.:.:dummy.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:dummy.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:dummy.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" # cp.path = "$$OUT_PWD" +qt_autogen_tools_initial_setup(Dummy) # special case begin get_target_property(binary_dir Dummy BINARY_DIR) file(COPY qmldir plugins.qmltypes DESTINATION ${binary_dir} ) +# special case end diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt index 442ce7f080..b56eac2165 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from extendedtype.pro. ##################################################################### -## ExtendedType Plugin: +## ExtendedType Generic Library: ##################################################################### -add_qt_plugin(ExtendedType +add_cmake_library(ExtendedType + MODULE SOURCES plugin.cpp plugin.h types.h @@ -15,16 +16,14 @@ add_qt_plugin(ExtendedType ) #### Keys ignored in scope 1:.:.:extendedtype.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:extendedtype.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:extendedtype.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" # cp.path = "$$OUT_PWD" + +qt_autogen_tools_initial_setup(ExtendedType) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt index 7917b3643a..11ac920aeb 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from extendedtype.pro. ##################################################################### -## ExtendedType Plugin: +## ExtendedType Generic Library: ##################################################################### -add_qt_plugin(ExtendedType -# special case begin - TYPE qml_plugin - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -# special case end +add_cmake_library(ExtendedType + MODULE + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES plugin.cpp plugin.h types.h @@ -19,20 +17,17 @@ add_qt_plugin(ExtendedType ) #### Keys ignored in scope 1:.:.:extendedtype.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:extendedtype.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:extendedtype.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" # cp.path = "$$OUT_PWD" +qt_autogen_tools_initial_setup(ExtendedType) # special case begin get_target_property(binary_dir ExtendedType BINARY_DIR) file(COPY qmldir plugins.qmltypes diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt index 536abe9c53..89079d0e0e 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from imports.pro. ##################################################################### -## Imports Plugin: +## Imports Generic Library: ##################################################################### -add_qt_plugin(Imports +add_cmake_library(Imports + MODULE SOURCES imports.cpp imports.h imports_plugin.cpp imports_plugin.h @@ -15,16 +16,14 @@ add_qt_plugin(Imports ) #### Keys ignored in scope 1:.:.:imports.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:imports.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:imports.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" "CompositeImports.qml" # cp.path = "$$OUT_PWD" + +qt_autogen_tools_initial_setup(Imports) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt index f34ccb84e3..611842f9a3 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from imports.pro. ##################################################################### -## Imports Plugin: +## Imports Generic Library: ##################################################################### -add_qt_plugin(Imports -# special case begin - TYPE qml_plugin - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -# special case end +add_cmake_library(Imports + MODULE + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES imports.cpp imports.h imports_plugin.cpp imports_plugin.h @@ -19,22 +17,20 @@ add_qt_plugin(Imports ) #### Keys ignored in scope 1:.:.:imports.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:imports.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:imports.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cp" # cp.files = "qmldir" "plugins.qmltypes" "CompositeImports.qml" # cp.path = "$$OUT_PWD" +qt_autogen_tools_initial_setup(Imports) # special case begin get_target_property(binary_dir Imports BINARY_DIR) file(COPY qmldir plugins.qmltypes CompositeImports.qml DESTINATION ${binary_dir} ) +# special case end diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt index 04a77f825c..e29fe730f5 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from versions.pro. ##################################################################### -## Versions Plugin: +## Versions Generic Library: ##################################################################### -add_qt_plugin(Versions +add_cmake_library(Versions + MODULE SOURCES versions.cpp versions.h versions_plugin.cpp versions_plugin.h @@ -15,16 +16,14 @@ add_qt_plugin(Versions ) #### Keys ignored in scope 1:.:.:versions.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:versions.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:versions.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cpqmldir" # cpqmldir.files = "qmldir" "plugins.qmltypes" # cpqmldir.path = "$$OUT_PWD" + +qt_autogen_tools_initial_setup(Versions) diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt index 88e058f0c9..3b3a6eb77b 100644 --- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from versions.pro. ##################################################################### -## Versions Plugin: +## Versions Generic Library: ##################################################################### -add_qt_plugin(Versions -# special case begin - TYPE qml_plugin - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -# special case end +add_cmake_library(Versions + MODULE + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES versions.cpp versions.h versions_plugin.cpp versions_plugin.h @@ -19,20 +17,17 @@ add_qt_plugin(Versions ) #### Keys ignored in scope 1:.:.:versions.pro:<TRUE>: -# CONFIG = "qt" "plugin" "-debug_and_release_target" # TEMPLATE = "lib" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:versions.pro:NOT build_pass AND QT_FEATURE_debug_and_release: -# CONFIG = "release" - #### Keys ignored in scope 3:.:.:versions.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD: # COPIES = "cpqmldir" # cpqmldir.files = "qmldir" "plugins.qmltypes" # cpqmldir.path = "$$OUT_PWD" +qt_autogen_tools_initial_setup(Versions) # special case begin get_target_property(binary_dir Versions BINARY_DIR) file(COPY qmldir plugins.qmltypes diff --git a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt new file mode 100644 index 0000000000..57e1930778 --- /dev/null +++ b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt @@ -0,0 +1,64 @@ +# Generated from qqmlecmascript.pro. + +##################################################################### +## tst_qqmlecmascript Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qqmlecmascript + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + testtypes.cpp testtypes.h + tst_qqmlecmascript.cpp + INCLUDE_DIRECTORIES + ../../shared + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::QmlPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Network + Qt::Qml + TESTDATA ${test_data} +) + +# Resources: +set(qqmlecmascript_resource_files + "data/include.js" + "data/include.qml" + "data/js/include2.js" + "data/js/include3.js" +) + +add_qt_resource(tst_qqmlecmascript "qqmlecmascript" + PREFIX + "/" + FILES + ${qqmlecmascript_resource_files} +) + + +## Scopes: +##################################################################### + +extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qml/qqmlecmascript/CMakeLists.txt b/tests/auto/qml/qqmlecmascript/CMakeLists.txt index 693fa90c00..d467791e87 100644 --- a/tests/auto/qml/qqmlecmascript/CMakeLists.txt +++ b/tests/auto/qml/qqmlecmascript/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlecmascript - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -33,37 +30,31 @@ add_qt_test(tst_qqmlecmascript ) # Resources: +set(qqmlecmascript_resource_files + "data/include.js" + "data/include.qml" + "data/js/include2.js" + "data/js/include3.js" +) + # special case begin set_source_files_properties( - data/include.js - data/include.qml - data/js/include2.js - data/js/include3.js + ${qqmlecmascript_resource_files} PROPERTIES - QT_SKIP_QUICKCOMPILER 1 -) - + QT_SKIP_QUICKCOMPILER 1) # special case end + add_qt_resource(tst_qqmlecmascript "qqmlecmascript" PREFIX "/" FILES - data/include.js - data/include.qml - data/js/include2.js - data/js/include3.js + ${qqmlecmascript_resource_files} ) -#### Keys ignored in scope 1:.:.:qqmlecmascript.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlecmascript.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets diff --git a/tests/auto/qml/qqmlengine/CMakeLists.txt b/tests/auto/qml/qqmlengine/CMakeLists.txt index e4c38d384c..dff90d6c3b 100644 --- a/tests/auto/qml/qqmlengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlengine/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlengine - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlengine.cpp diff --git a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt index 66856f3ae0..dd5b120560 100644 --- a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt +++ b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt @@ -1,11 +1,10 @@ -# Generated from qqmlenginecleanup.pro. +# Generated from tst_qqmlenginecleanup.pro. ##################################################################### ## tst_qqmlenginecleanup Test: ##################################################################### add_qt_test(tst_qqmlenginecleanup - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlenginecleanup.cpp @@ -14,18 +13,13 @@ add_qt_test(tst_qqmlenginecleanup LIBRARIES Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::Gui Qt::Qml ) -#### Keys ignored in scope 2:.:.:tst_qqmlenginecleanup.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:.:tst_qqmlenginecleanup.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" @@ -35,4 +29,3 @@ extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) -add_subdirectory(CustomModuleImport) diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt new file mode 100644 index 0000000000..a96db2a535 --- /dev/null +++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from CustomModule.pro. + +##################################################################### +## CustomModule Generic Library: +##################################################################### + +add_cmake_library(CustomModule + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule" + SOURCES + moduleplugin.cpp + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +# Resources: +set(moduleplugin_resource_files + "ModuleType.qml" +) + +add_qt_resource(CustomModule "moduleplugin" + PREFIX + "/" + FILES + ${moduleplugin_resource_files} +) + + +#### Keys ignored in scope 1:.:.:CustomModule.pro:<TRUE>: +# IMPORT_FILES = "qmldir" +# TEMPLATE = "lib" diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt index 5338e58334..f8a7a5ed93 100644 --- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt +++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt @@ -1,13 +1,10 @@ # Generated from CustomModule.pro. ##################################################################### -## stomModule Module: +## CustomModule Generic Library: ##################################################################### -add_qt_plugin(CustomModule - # special case begin - TYPE qml_plugin - # special case end +add_cmake_library(CustomModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule" SOURCES moduleplugin.cpp @@ -19,20 +16,24 @@ add_qt_plugin(CustomModule ) # Resources: +set(moduleplugin_resource_files + "ModuleType.qml" +) + add_qt_resource(CustomModule "moduleplugin" PREFIX "/" FILES - ModuleType.qml + ${moduleplugin_resource_files} ) #### Keys ignored in scope 1:.:.:CustomModule.pro:<TRUE>: -# CONFIG = "qtquickcompiler" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" # special case begin +qt_autogen_tools_initial_setup(CustomModule) file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule" ) diff --git a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt index e65dc58ddf..988ffc9599 100644 --- a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt +++ b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlitemmodels - GUI SOURCES ../../shared/util.cpp ../../shared/util.h qtestmodel.h @@ -28,15 +25,11 @@ add_qt_test(tst_qqmlitemmodels ) #### Keys ignored in scope 1:.:.:qqmlitemmodels.pro:<TRUE>: -# CONFIG = "testcase" # DISTFILES = "data/modelindex.qml" "data/persistentmodelindex.qml" "data/itemselectionrange.qml" "data/modelindexlist.qml" "data/itemselection.qml" "data/modelindexconversion.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlitemmodels.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlitemmodels CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt index 9ed977bddc..c520d48972 100644 --- a/tests/auto/qml/qqmllanguage/CMakeLists.txt +++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt @@ -35,21 +35,22 @@ add_qt_test(tst_qqmllanguage ## Scopes: ##################################################################### -# Resources: -set_source_files_properties("data/I18nType30.qml" - PROPERTIES QT_RESOURCE_ALIAS "data/I18nTypeÁâãäå.qml" -) -set(qqmllanguage_resource_files - "data/I18nType30.qml" -) - -add_qt_resource(tst_qqmllanguage "qqmllanguage" - PREFIX - "/" - FILES - ${qqmllanguage_resource_files} -) - +if(ANDROID) + # Resources: + set_source_files_properties("data/I18nType30.qml" + PROPERTIES QT_RESOURCE_ALIAS "data/I18nTypeÁâãäå.qml" + ) + set(qqmllanguage_resource_files + "data/I18nType30.qml" + ) + + add_qt_resource(tst_qqmllanguage "qqmllanguage" + PREFIX + "/" + FILES + ${qqmllanguage_resource_files} + ) +endif() extend_target(tst_qqmllanguage CONDITION ANDROID OR APPLE_IOS DEFINES diff --git a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt index 211f9beb6d..7c6c8145c6 100644 --- a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt +++ b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmllistcompositor - GUI SOURCES tst_qqmllistcompositor.cpp LIBRARIES @@ -21,11 +20,5 @@ add_qt_test(tst_qqmllistcompositor Qt::Quick ) -#### Keys ignored in scope 1:.:.:qqmllistcompositor.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmllistcompositor.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmllistmodel/CMakeLists.txt b/tests/auto/qml/qqmllistmodel/CMakeLists.txt index 72c219e14b..407ca10381 100644 --- a/tests/auto/qml/qqmllistmodel/CMakeLists.txt +++ b/tests/auto/qml/qqmllistmodel/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmllistmodel - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmllistmodel.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qqmllistmodel TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmllistmodel.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmllistmodel.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmllistmodel CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt index cd4dd7db7f..f36bcceeb2 100644 --- a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt +++ b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmllistmodelworkerscript - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmllistmodelworkerscript.cpp @@ -33,15 +30,9 @@ add_qt_test(tst_qqmllistmodelworkerscript TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmllistmodelworkerscript.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmllistmodelworkerscript.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmllistreference/CMakeLists.txt b/tests/auto/qml/qqmllistreference/CMakeLists.txt index e30129b7e0..7357a030ce 100644 --- a/tests/auto/qml/qqmllistreference/CMakeLists.txt +++ b/tests/auto/qml/qqmllistreference/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmllistreference - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmllistreference.cpp @@ -31,15 +28,9 @@ add_qt_test(tst_qqmllistreference TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmllistreference.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmllistreference.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmllistreference CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmllocale/CMakeLists.txt b/tests/auto/qml/qqmllocale/CMakeLists.txt index d21e0b8e0f..13bfd08505 100644 --- a/tests/auto/qml/qqmllocale/CMakeLists.txt +++ b/tests/auto/qml/qqmllocale/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmllocale - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmllocale.cpp @@ -27,15 +24,9 @@ add_qt_test(tst_qqmllocale TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmllocale.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmllocale.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmllocale CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt index 25a05ed111..02d18c9eb5 100644 --- a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt +++ b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlmetaobject - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlmetaobject.cpp @@ -27,15 +24,9 @@ add_qt_test(tst_qqmlmetaobject TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlmetaobject.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlmetaobject.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlmetaobject CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt index 0f96747410..38d3034509 100644 --- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt +++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlmetatype - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlmetatype.cpp @@ -30,31 +27,33 @@ add_qt_test(tst_qqmlmetatype ) # Resources: +set(qmake_qmlfiles_resource_files + "data/CompositeType.qml" +) + add_qt_resource(tst_qqmlmetatype "qmake_qmlfiles" PREFIX "/tstqqmlmetatype" FILES - data/CompositeType.qml + ${qmake_qmlfiles_resource_files} +) +set(qmake_qmldirresource_resource_files + "data/Components/App.qml" + "data/Components/qmldir" + "data/enumsInRecursiveImport.qml" ) + add_qt_resource(tst_qqmlmetatype "qmake_qmldirresource" PREFIX "/" FILES - data/Components/App.qml - data/Components/qmldir - data/enumsInRecursiveImport.qml + ${qmake_qmldirresource_resource_files} ) -#### Keys ignored in scope 1:.:.:qqmlmetatype.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlmetatype.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlmetatype CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt index 097f1ba517..7d96a54a8e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from invalidFirstCommandModule.pro. ##################################################################### -## invalidFirstCommandModule Plugin: +## invalidFirstCommandModule Generic Library: ##################################################################### -add_qt_plugin(invalidFirstCommandModule +add_cmake_library(invalidFirstCommandModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(invalidFirstCommandModule ) #### Keys ignored in scope 1:.:.:invalidFirstCommandModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(invalidFirstCommandModule) diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt index b0e7ccb400..3f318abfc3 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from invalidFirstCommandModule.pro. ##################################################################### -## invalidFirstCommandModule Plugin: +## invalidFirstCommandModule Generic Library: ##################################################################### -add_qt_plugin(invalidFirstCommandModule +add_cmake_library(invalidFirstCommandModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(invalidFirstCommandModule ) #### Keys ignored in scope 1:.:.:invalidFirstCommandModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(invalidFirstCommandModule) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule" diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt index d04f2f6ecf..58c1347556 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from invalidNamespaceModule.pro. ##################################################################### -## invalidNamespaceModule Plugin: +## invalidNamespaceModule Generic Library: ##################################################################### -add_qt_plugin(invalidNamespaceModule +add_cmake_library(invalidNamespaceModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(invalidNamespaceModule ) #### Keys ignored in scope 1:.:.:invalidNamespaceModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(invalidNamespaceModule) diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt index d8f71cd07b..3ec16a1007 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from invalidNamespaceModule.pro. ##################################################################### -## invalidNamespaceModule Plugin: +## invalidNamespaceModule Generic Library: ##################################################################### -add_qt_plugin(invalidNamespaceModule +add_cmake_library(invalidNamespaceModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(invalidNamespaceModule ) #### Keys ignored in scope 1:.:.:invalidNamespaceModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(invalidNamespaceModule) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule" diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt index 18a3addd86..01d30f29a1 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from nestedPlugin.pro. ##################################################################### -## stedPlugin Module: +## nestedPlugin Generic Library: ##################################################################### -add_qt_module(stedPlugin +add_cmake_library(nestedPlugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType" SOURCES nestedPlugin.cpp @@ -19,6 +19,5 @@ add_qt_module(stedPlugin ) #### Keys ignored in scope 1:.:.:nestedPlugin.pro:<TRUE>: -# CONFIG = "nestedPlugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt index 0a659329a2..b925765217 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt @@ -1,14 +1,11 @@ # Generated from nestedPlugin.pro. ##################################################################### -## stedPlugin Module: +## nestedPlugin Generic Library: ##################################################################### -add_qt_plugin(nestedPlugin +add_cmake_library(nestedPlugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType" -# special case begin - TYPE qml_plugin -# special case end SOURCES nestedPlugin.cpp LIBRARIES @@ -22,11 +19,11 @@ add_qt_plugin(nestedPlugin ) #### Keys ignored in scope 1:.:.:nestedPlugin.pro:<TRUE>: -# CONFIG = "nestedPlugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" # special case begin +qt_autogen_tools_initial_setup(nestedPlugin) file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType" ) diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt index c3d4ecf7a2..f055b4d374 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from nonstrictModule.pro. ##################################################################### -## nonstrictModule Plugin: +## nonstrictModule Generic Library: ##################################################################### -add_qt_plugin(nonstrictModule +add_cmake_library(nonstrictModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(nonstrictModule ) #### Keys ignored in scope 1:.:.:nonstrictModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(nonstrictModule) diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt index 8a5bcdd685..32b4393d71 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from nonstrictModule.pro. ##################################################################### -## nonstrictModule Plugin: +## nonstrictModule Generic Library: ##################################################################### -add_qt_plugin(nonstrictModule +add_cmake_library(nonstrictModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(nonstrictModule ) #### Keys ignored in scope 1:.:.:nonstrictModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(nonstrictModule) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule" diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt index 0ab0991f45..bd8c267456 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from plugin.2.1.pro. ##################################################################### -## plugin.2.1 Plugin: +## plugin.2.1 Generic Library: ##################################################################### -add_qt_plugin(plugin.2.1 +add_cmake_library(plugin.2.1 + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(plugin.2.1 ) #### Keys ignored in scope 1:.:.:plugin.2.1.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(plugin.2.1) diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt index bd50d1b5ce..c33407a619 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from plugin.2.1.pro. ##################################################################### -## plugin.2.1 Plugin: +## plugin.2.1 Generic Library: ##################################################################### -add_qt_plugin(plugin.2.1 +add_cmake_library(plugin.2.1 + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(plugin.2.1 ) #### Keys ignored in scope 1:.:.:plugin.2.1.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(plugin.2.1) # special case begin set_target_properties(plugin.2.1 PROPERTIES OUTPUT_NAME "plugin") file(COPY qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt index 2f4f165097..fa11a4f0dc 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from childplugin.pro. ##################################################################### -## ildplugin Module: +## childplugin Generic Library: ##################################################################### -add_qt_module(ildplugin +add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin" SOURCES childplugin.cpp @@ -19,6 +19,5 @@ add_qt_module(ildplugin ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: -# CONFIG = "childplugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt index b4362aaaf9..61ab84a7f6 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt @@ -1,14 +1,11 @@ # Generated from childplugin.pro. ##################################################################### -## ildplugin Module: +## childplugin Generic Library: ##################################################################### -add_qt_plugin(childplugin.2.1 +add_cmake_library(childplugin.2.1 # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin" -# special case begin - TYPE qml_plugin -# special case end SOURCES childplugin.cpp LIBRARIES @@ -22,11 +19,11 @@ add_qt_plugin(childplugin.2.1 ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: -# CONFIG = "childplugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" # special case begin +qt_autogen_tools_initial_setup(childplugin.2.1) set_target_properties(childplugin.2.1 PROPERTIES OUTPUT_NAME "childplugin") file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin" diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt index da2d627290..9bb54a6baf 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from plugin.2.2.pro. ##################################################################### -## plugin.2.2 Plugin: +## plugin.2.2 Generic Library: ##################################################################### -add_qt_plugin(plugin.2.2 +add_cmake_library(plugin.2.2 + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(plugin.2.2 ) #### Keys ignored in scope 1:.:.:plugin.2.2.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(plugin.2.2) diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt index 8c4f760817..f5e24fa991 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from plugin.2.2.pro. ##################################################################### -## plugin.2.2 Plugin: +## plugin.2.2 Generic Library: ##################################################################### -add_qt_plugin(plugin.2.2 +add_cmake_library(plugin.2.2 + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(plugin.2.2 ) #### Keys ignored in scope 1:.:.:plugin.2.2.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(plugin.2.2) # special case begin set_target_properties(plugin.2.2 PROPERTIES OUTPUT_NAME "plugin") file(COPY qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt index 49a78baeea..9cd696fa03 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from plugin.2.pro. ##################################################################### -## plugin.2 Plugin: +## plugin.2 Generic Library: ##################################################################### -add_qt_plugin(plugin.2 +add_cmake_library(plugin.2 + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(plugin.2 ) #### Keys ignored in scope 1:.:.:plugin.2.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(plugin.2) diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt index 3a7ee03721..aafa7fd17e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from plugin.2.pro. ##################################################################### -## plugin.2 Plugin: +## plugin.2 Generic Library: ##################################################################### -add_qt_plugin(plugin.2 +add_cmake_library(plugin.2 + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(plugin.2 ) #### Keys ignored in scope 1:.:.:plugin.2.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(plugin.2) # special case begin set_target_properties(plugin.2 PROPERTIES OUTPUT_NAME "plugin") file(COPY qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt index bf7ecee408..24c06ade06 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from childplugin.pro. ##################################################################### -## ildplugin Module: +## childplugin Generic Library: ##################################################################### -add_qt_module(ildplugin +add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin" SOURCES childplugin.cpp @@ -19,7 +19,6 @@ add_qt_module(ildplugin ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: -# CONFIG = "childplugin" # IMPORT_DIR = "DESTDIR" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt index 6a36a6190f..d4d64577ce 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt @@ -1,14 +1,11 @@ # Generated from childplugin.pro. ##################################################################### -## ildplugin Module: +## childplugin Generic Library: ##################################################################### -add_qt_plugin(childplugin.2 +add_cmake_library(childplugin.2 # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin" -# special case begin - TYPE qml_plugin -# special case end SOURCES childplugin.cpp LIBRARIES @@ -22,12 +19,12 @@ add_qt_plugin(childplugin.2 ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: -# CONFIG = "childplugin" # IMPORT_DIR = "DESTDIR" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" # special case begin +qt_autogen_tools_initial_setup(childplugin.2) set_target_properties(childplugin.2 PROPERTIES OUTPUT_NAME "childplugin") file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin" diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt index 029b426404..ecd463389b 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from plugin.pro. ##################################################################### -## plugin Plugin: +## plugin Generic Library: ##################################################################### -add_qt_plugin(plugin +add_cmake_library(plugin + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(plugin ) #### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(plugin) diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt index 907216f9de..3d9f1e6da2 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from plugin.pro. ##################################################################### -## plugin Plugin: +## plugin Generic Library: ##################################################################### -add_qt_plugin(plugin +add_cmake_library(plugin + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(plugin ) #### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(plugin) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType" diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt index 7a2ba6bac1..2037c70f28 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from childplugin.pro. ##################################################################### -## ildplugin Module: +## childplugin Generic Library: ##################################################################### -add_qt_module(ildplugin +add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin" SOURCES childplugin.cpp @@ -19,6 +19,5 @@ add_qt_module(ildplugin ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: -# CONFIG = "childplugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt index c7e997f5e0..eb3964a0c3 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt @@ -1,14 +1,11 @@ # Generated from childplugin.pro. ##################################################################### -## ildplugin Module: +## childplugin Generic Library: ##################################################################### -add_qt_plugin(childplugin +add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin" -# special case begin - TYPE qml_plugin -# special case end SOURCES childplugin.cpp LIBRARIES @@ -22,11 +19,11 @@ add_qt_plugin(childplugin ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: -# CONFIG = "childplugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" # special case begin +qt_autogen_tools_initial_setup(childplugin) file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin" ) diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt index 77ca7e8094..2cf70361dc 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from pluginMixed.pro. ##################################################################### -## pluginMixed Plugin: +## pluginMixed Generic Library: ##################################################################### -add_qt_plugin(pluginMixed +add_cmake_library(pluginMixed + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(pluginMixed ) #### Keys ignored in scope 1:.:.:pluginMixed.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "Foo.qml" "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(pluginMixed) diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt index f1a6bc227a..ce2b0a7cf0 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from pluginMixed.pro. ##################################################################### -## pluginMixed Plugin: +## pluginMixed Generic Library: ##################################################################### -add_qt_plugin(pluginMixed +add_cmake_library(pluginMixed + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(pluginMixed ) #### Keys ignored in scope 1:.:.:pluginMixed.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "Foo.qml" "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(pluginMixed) # special case begin file(COPY qmldir Foo.qml DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType" diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt index d74a877f96..b5ea40704a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from pluginVersion.pro. ##################################################################### -## pluginVersion Plugin: +## pluginVersion Generic Library: ##################################################################### -add_qt_plugin(pluginVersion +add_cmake_library(pluginVersion + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(pluginVersion ) #### Keys ignored in scope 1:.:.:pluginVersion.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(pluginVersion) diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt index f7f4d9e714..b3f448f669 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from pluginVersion.pro. ##################################################################### -## pluginVersion Plugin: +## pluginVersion Generic Library: ##################################################################### -add_qt_plugin(pluginVersion +add_cmake_library(pluginVersion + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(pluginVersion ) #### Keys ignored in scope 1:.:.:pluginVersion.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(pluginVersion) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt index 674db41333..5cf3bde36d 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from pluginWithQmlFile.pro. ##################################################################### -## pluginWithQmlFile Plugin: +## pluginWithQmlFile Generic Library: ##################################################################### -add_qt_plugin(pluginWithQmlFile +add_cmake_library(pluginWithQmlFile + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(pluginWithQmlFile ) #### Keys ignored in scope 1:.:.:pluginWithQmlFile.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" "MyQmlFile.qml" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(pluginWithQmlFile) diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt index 636e919e44..7cb468c169 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from pluginWithQmlFile.pro. ##################################################################### -## pluginWithQmlFile Plugin: +## pluginWithQmlFile Generic Library: ##################################################################### -add_qt_plugin(pluginWithQmlFile +add_cmake_library(pluginWithQmlFile + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(pluginWithQmlFile ) #### Keys ignored in scope 1:.:.:pluginWithQmlFile.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" "MyQmlFile.qml" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(pluginWithQmlFile) # special case begin file(COPY qmldir MyQmlFile.qml DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile" diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt index 08b5371ff9..0a8844b169 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from pluginWrongCase.pro. ##################################################################### -## Plugin Plugin: +## Plugin Generic Library: ##################################################################### -add_qt_plugin(Plugin +add_cmake_library(Plugin + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(Plugin ) #### Keys ignored in scope 1:.:.:pluginWrongCase.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(Plugin) diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt index a7b0e44786..8ceb2efa99 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from pluginWrongCase.pro. ##################################################################### -## Plugin Plugin: +## Plugin Generic Library: ##################################################################### -add_qt_plugin(Plugin +add_cmake_library(Plugin + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(Plugin ) #### Keys ignored in scope 1:.:.:pluginWrongCase.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(Plugin) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase" diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt index 49c3a5fb54..dd74064201 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from preemptedStrictModule.pro. ##################################################################### -## preemptedStrictModule Plugin: +## preemptedStrictModule Generic Library: ##################################################################### -add_qt_plugin(preemptedStrictModule +add_cmake_library(preemptedStrictModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(preemptedStrictModule ) #### Keys ignored in scope 1:.:.:preemptedStrictModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(preemptedStrictModule) diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt index b9dfd31dd3..fe4517571a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from preemptedStrictModule.pro. ##################################################################### -## preemptedStrictModule Plugin: +## preemptedStrictModule Generic Library: ##################################################################### -add_qt_plugin(preemptedStrictModule +add_cmake_library(preemptedStrictModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(preemptedStrictModule ) #### Keys ignored in scope 1:.:.:preemptedStrictModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(preemptedStrictModule) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt index 31a7a7933f..a436682442 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from preemptiveModule.pro. ##################################################################### -## preemptiveModule Plugin: +## preemptiveModule Generic Library: ##################################################################### -add_qt_plugin(preemptiveModule +add_cmake_library(preemptiveModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(preemptiveModule ) #### Keys ignored in scope 1:.:.:preemptiveModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(preemptiveModule) diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt index d9cba40ce2..c2510ec868 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from preemptiveModule.pro. ##################################################################### -## preemptiveModule Plugin: +## preemptiveModule Generic Library: ##################################################################### -add_qt_plugin(preemptiveModule +add_cmake_library(preemptiveModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(preemptiveModule ) #### Keys ignored in scope 1:.:.:preemptiveModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(preemptiveModule) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule" diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt index 6528ebfb25..dfd26339ee 100644 --- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from protectedModule.pro. ##################################################################### -## protectedModule Plugin: +## protectedModule Generic Library: ##################################################################### -add_qt_plugin(protectedModule +add_cmake_library(protectedModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(protectedModule ) #### Keys ignored in scope 1:.:.:protectedModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(protectedModule) diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt index 313225b0ae..8522d435b2 100644 --- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from protectedModule.pro. ##################################################################### -## protectedModule Plugin: +## protectedModule Generic Library: ##################################################################### -add_qt_plugin(protectedModule +add_cmake_library(protectedModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(protectedModule ) #### Keys ignored in scope 1:.:.:protectedModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(protectedModule) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule" diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt index e597514e4a..ee29087a5d 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from strictModule.2.pro. ##################################################################### -## strictModule.2 Plugin: +## strictModule.2 Generic Library: ##################################################################### -add_qt_plugin(strictModule.2 +add_cmake_library(strictModule.2 + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(strictModule.2 ) #### Keys ignored in scope 1:.:.:strictModule.2.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(strictModule.2) diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt index 5b76d771fa..6a5aecfc1f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from strictModule.2.pro. ##################################################################### -## strictModule.2 Plugin: +## strictModule.2 Generic Library: ##################################################################### -add_qt_plugin(strictModule.2 +add_cmake_library(strictModule.2 + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(strictModule.2 ) #### Keys ignored in scope 1:.:.:strictModule.2.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(strictModule.2) # special case begin set_target_properties(strictModule.2 PROPERTIES OUTPUT_NAME "strictModule") file(COPY qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt index 6876de778d..299812ecdb 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt @@ -1,10 +1,11 @@ # Generated from strictModule.pro. ##################################################################### -## strictModule Plugin: +## strictModule Generic Library: ##################################################################### -add_qt_plugin(strictModule +add_cmake_library(strictModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule" SOURCES plugin.cpp @@ -19,6 +20,7 @@ add_qt_plugin(strictModule ) #### Keys ignored in scope 1:.:.:strictModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" + +qt_autogen_tools_initial_setup(strictModule) diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt index 98508d32bf..690ab0b48b 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from strictModule.pro. ##################################################################### -## strictModule Plugin: +## strictModule Generic Library: ##################################################################### -add_qt_plugin(strictModule +add_cmake_library(strictModule + MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule" -# special case begin - TYPE qml_plugin -# special case end SOURCES plugin.cpp LIBRARIES @@ -22,10 +20,10 @@ add_qt_plugin(strictModule ) #### Keys ignored in scope 1:.:.:strictModule.pro:<TRUE>: -# CONFIG = "plugin" # IMPORT_FILES = "qmldir" # TEMPLATE = "lib" +qt_autogen_tools_initial_setup(strictModule) # special case begin file(COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule" diff --git a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt index b72eb91bae..c064f18280 100644 --- a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt +++ b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlsqldatabase - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlsqldatabase.cpp @@ -32,15 +29,9 @@ add_qt_test(tst_qqmlsqldatabase TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlsqldatabase.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlsqldatabase.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt index e187fe7b1f..fb546bfdb5 100644 --- a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt +++ b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmlstatemachine - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlstatemachine.cpp @@ -22,15 +21,9 @@ add_qt_test(tst_qqmlstatemachine Qt::Quick ) -#### Keys ignored in scope 1:.:.:qqmlstatemachine.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlstatemachine.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlstatemachine CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmltablemodel/CMakeLists.txt b/tests/auto/qml/qqmltablemodel/CMakeLists.txt index e37c8e700d..88c35aa111 100644 --- a/tests/auto/qml/qqmltablemodel/CMakeLists.txt +++ b/tests/auto/qml/qqmltablemodel/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmltablemodel - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmltablemodel.cpp @@ -31,9 +28,6 @@ add_qt_test(tst_qqmltablemodel TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmltablemodel.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### diff --git a/tests/auto/qml/qqmltimer/CMakeLists.txt b/tests/auto/qml/qqmltimer/CMakeLists.txt index aac4d58128..0a8982d1c6 100644 --- a/tests/auto/qml/qqmltimer/CMakeLists.txt +++ b/tests/auto/qml/qqmltimer/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qqmltimer - GUI SOURCES tst_qqmltimer.cpp LIBRARIES @@ -19,11 +18,5 @@ add_qt_test(tst_qqmltimer Qt::Quick ) -#### Keys ignored in scope 1:.:.:qqmltimer.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qqmltimer.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt new file mode 100644 index 0000000000..968b04f6ae --- /dev/null +++ b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt @@ -0,0 +1,56 @@ +# Generated from qqmltranslation.pro. + +##################################################################### +## tst_qqmltranslation Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qqmltranslation + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qqmltranslation.cpp + INCLUDE_DIRECTORIES + ../../shared + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::QmlPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + TESTDATA ${test_data} +) + +# Resources: +set(translation_resource_files + "qml_fr.qm" + "translation.qml" +) + +add_qt_resource(tst_qqmltranslation "translation" + PREFIX + "/" + BASE + "data" + FILES + ${translation_resource_files} +) + + +## Scopes: +##################################################################### + +extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt index 8d96732e1f..e6488e42dc 100644 --- a/tests/auto/qml/qqmltranslation/CMakeLists.txt +++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmltranslation - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmltranslation.cpp @@ -30,6 +27,11 @@ add_qt_test(tst_qqmltranslation ) # Resources: +set(translation_resource_files + "qml_fr.qm" + "translation.qml" +) + # special case begin set_source_files_properties( data/translation.qml @@ -43,26 +45,20 @@ set_source_files_properties( QT_RESOURCE_ALIAS qml_fr.qm ) # special case end + add_qt_resource(tst_qqmltranslation "translation" PREFIX "/" BASE "data" FILES - qml_fr.qm - translation.qml + ${translation_resource_files} ) -#### Keys ignored in scope 1:.:.:qqmltranslation.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmltranslation.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt index e36245bef8..512adcf953 100644 --- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt +++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt @@ -1,11 +1,16 @@ -# Generated from qqmltypeloader.pro. +# Generated from tst_qqmltypeloader.pro. ##################################################################### ## tst_qqmltypeloader Test: ##################################################################### +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + add_qt_test(tst_qqmltypeloader - GUI SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -15,19 +20,15 @@ add_qt_test(tst_qqmltypeloader LIBRARIES Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::Gui Qt::Qml Qt::Quick + TESTDATA ${test_data} ) -#### Keys ignored in scope 2:.:.:tst_qqmltypeloader.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:.:tst_qqmltypeloader.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmltypeloader CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" @@ -37,4 +38,3 @@ extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) -add_subdirectory(SlowImport) diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt new file mode 100644 index 0000000000..5951b4e84c --- /dev/null +++ b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from Slow.pro. + +##################################################################### +## Slow Generic Library: +##################################################################### + +add_cmake_library(Slow + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow" + SOURCES + plugin.cpp plugin.h + slow.cpp slow.h + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:Slow.pro:<TRUE>: +# IMPORT_FILES = "qmldir" +# TEMPLATE = "lib" diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt index 2bd4922f30..89aaa009ab 100644 --- a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt +++ b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt @@ -1,13 +1,10 @@ # Generated from Slow.pro. ##################################################################### -## ow Module: +## Slow Generic Library: ##################################################################### -add_qt_plugin(Slow - # special case begin - TYPE qml_plugin - # special case end +add_cmake_library(Slow OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow" SOURCES plugin.cpp plugin.h @@ -26,6 +23,7 @@ add_qt_plugin(Slow # TEMPLATE = "lib" # special case begin +qt_autogen_tools_initial_setup(Slow) file (COPY qmldir DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../Slow" ) diff --git a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt index 8ba29695f7..0b34b211a3 100644 --- a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt +++ b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlvaluetypeproviders - GUI SOURCES ../../shared/util.cpp ../../shared/util.h testtypes.cpp testtypes.h @@ -32,15 +29,9 @@ add_qt_test(tst_qqmlvaluetypeproviders TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qqmlvaluetypeproviders.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlvaluetypeproviders.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt index 4d6eb47a4d..22cec428d6 100644 --- a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt +++ b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlvaluetypes - GUI SOURCES ../../shared/util.cpp ../../shared/util.h testtypes.cpp testtypes.h @@ -33,15 +30,11 @@ add_qt_test(tst_qqmlvaluetypes ) #### Keys ignored in scope 1:.:.:qqmlvaluetypes.pro:<TRUE>: -# CONFIG = "testcase" # DISTFILES = "data/customvaluetype.qml" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qqmlvaluetypes.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" |