Regenerate remaining tests to be in sync

Change-Id: I200c8f58ad13bc1bc78409a3ce49348584ba5b51
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

117 files changed, 787 insertions, 781 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\\\"
diff --git a/tests/benchmarks/particles/affectors/CMakeLists.txt b/tests/benchmarks/particles/affectors/CMakeLists.txt
index 75a6b52f73..0a6b52e563 100644
--- a/tests/benchmarks/particles/affectors/CMakeLists.txt
+++ b/tests/benchmarks/particles/affectors/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_affectors Binary:
 #####################################################################
 
-add_qt_executable(tst_affectors
-    GUI
+add_qt_benchmark(tst_affectors
     SOURCES
         tst_affectors.cpp
     DEFINES
@@ -23,6 +22,3 @@ add_qt_executable(tst_affectors
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:affectors.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/particles/emission/CMakeLists.txt b/tests/benchmarks/particles/emission/CMakeLists.txt
index 7749d5f877..de9598b76f 100644
--- a/tests/benchmarks/particles/emission/CMakeLists.txt
+++ b/tests/benchmarks/particles/emission/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_emission Binary:
 #####################################################################
 
-add_qt_executable(tst_emission
-    GUI
+add_qt_benchmark(tst_emission
     SOURCES
         tst_emission.cpp
     LIBRARIES
@@ -23,6 +22,3 @@ add_qt_executable(tst_emission
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:emission.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/animation/CMakeLists.txt b/tests/benchmarks/qml/animation/CMakeLists.txt
index 79416db229..e1697ad18b 100644
--- a/tests/benchmarks/qml/animation/CMakeLists.txt
+++ b/tests/benchmarks/qml/animation/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_animation Binary:
 #####################################################################
 
-add_qt_executable(tst_animation
-    GUI
+add_qt_benchmark(tst_animation
     SOURCES
         tst_animation.cpp
     DEFINES
@@ -23,11 +22,7 @@ add_qt_executable(tst_animation
 )
 
 #### Keys ignored in scope 1:.:.:animation.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:animation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/binding/CMakeLists.txt b/tests/benchmarks/qml/binding/CMakeLists.txt
index 7cc445700b..8069310430 100644
--- a/tests/benchmarks/qml/binding/CMakeLists.txt
+++ b/tests/benchmarks/qml/binding/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_binding Binary:
 #####################################################################
 
-add_qt_executable(tst_binding
-    GUI
+add_qt_benchmark(tst_binding
     SOURCES
         testtypes.cpp testtypes.h
         tst_binding.cpp
@@ -18,11 +17,7 @@ add_qt_executable(tst_binding
 )
 
 #### Keys ignored in scope 1:.:.:binding.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:binding.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/compilation/CMakeLists.txt b/tests/benchmarks/qml/compilation/CMakeLists.txt
index e4512d1960..ba6d59fdf5 100644
--- a/tests/benchmarks/qml/compilation/CMakeLists.txt
+++ b/tests/benchmarks/qml/compilation/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_compilation Binary:
 #####################################################################
 
-add_qt_executable(tst_compilation
-    GUI
+add_qt_benchmark(tst_compilation
     SOURCES
         tst_compilation.cpp
     DEFINES
@@ -20,11 +19,7 @@ add_qt_executable(tst_compilation
 )
 
 #### Keys ignored in scope 1:.:.:compilation.pro:<TRUE>:
-# CONFIG = "benchmark" "release"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:compilation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/creation/CMakeLists.txt b/tests/benchmarks/qml/creation/CMakeLists.txt
index 46f9f78126..3b3cd56d8e 100644
--- a/tests/benchmarks/qml/creation/CMakeLists.txt
+++ b/tests/benchmarks/qml/creation/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_creation Binary:
 #####################################################################
 
-add_qt_executable(tst_creation
-    GUI
+add_qt_benchmark(tst_creation
     SOURCES
         tst_creation.cpp
     DEFINES
@@ -23,11 +22,7 @@ add_qt_executable(tst_creation
 )
 
 #### Keys ignored in scope 1:.:.:creation.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:creation.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/holistic/CMakeLists.txt b/tests/benchmarks/qml/holistic/CMakeLists.txt
index 5f48cf9f3a..16942d0350 100644
--- a/tests/benchmarks/qml/holistic/CMakeLists.txt
+++ b/tests/benchmarks/qml/holistic/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_holistic Binary:
 #####################################################################
 
-add_qt_executable(tst_holistic
-    GUI
+add_qt_benchmark(tst_holistic
     SOURCES
         testtypes.cpp testtypes.h
         tst_holistic.cpp
@@ -19,11 +18,7 @@ add_qt_executable(tst_holistic
 )
 
 #### Keys ignored in scope 1:.:.:holistic.pro:<TRUE>:
-# CONFIG = "benchmark" "release"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:holistic.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/javascript/CMakeLists.txt b/tests/benchmarks/qml/javascript/CMakeLists.txt
index 3c767ce333..9a73b0f047 100644
--- a/tests/benchmarks/qml/javascript/CMakeLists.txt
+++ b/tests/benchmarks/qml/javascript/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_javascript Binary:
 #####################################################################
 
-add_qt_executable(tst_javascript
-    GUI
+add_qt_benchmark(tst_javascript
     SOURCES
         testtypes.cpp testtypes.h
         tst_javascript.cpp
@@ -18,11 +17,7 @@ add_qt_executable(tst_javascript
 )
 
 #### Keys ignored in scope 1:.:.:javascript.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:javascript.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt b/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
index 57aff6bf12..f44669cdc6 100644
--- a/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_bench_qjsengine Binary:
 #####################################################################
 
-add_qt_executable(tst_bench_qjsengine
-    GUI
+add_qt_benchmark(tst_bench_qjsengine
     SOURCES
         tst_qjsengine.cpp
     PUBLIC_LIBRARIES
@@ -15,11 +14,7 @@ add_qt_executable(tst_bench_qjsengine
 )
 
 #### Keys ignored in scope 1:.:.:qjsengine.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qjsengine.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt b/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
index ba82b28a86..c9dc3ad76d 100644
--- a/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_bench_qjsvalue Binary:
 #####################################################################
 
-add_qt_executable(tst_bench_qjsvalue
-    GUI
+add_qt_benchmark(tst_bench_qjsvalue
     SOURCES
         tst_qjsvalue.cpp
     PUBLIC_LIBRARIES
@@ -15,11 +14,7 @@ add_qt_executable(tst_bench_qjsvalue
 )
 
 #### Keys ignored in scope 1:.:.:qjsvalue.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qjsvalue.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt b/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
index b5d355eeee..dd5f818591 100644
--- a/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_bench_qjsvalueiterator Binary:
 #####################################################################
 
-add_qt_executable(tst_bench_qjsvalueiterator
-    GUI
+add_qt_benchmark(tst_bench_qjsvalueiterator
     SOURCES
         tst_qjsvalueiterator.cpp
     PUBLIC_LIBRARIES
@@ -14,5 +13,4 @@ add_qt_executable(tst_bench_qjsvalueiterator
 )
 
 #### Keys ignored in scope 1:.:.:qjsvalueiterator.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
diff --git a/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt b/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
index 5145874028..4c9df052a8 100644
--- a/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
+++ b/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_librarymetrics_performance Binary:
 #####################################################################
 
-add_qt_executable(tst_librarymetrics_performance
-    GUI
+add_qt_benchmark(tst_librarymetrics_performance
     SOURCES
         tst_librarymetrics_performance.cpp
     PUBLIC_LIBRARIES
@@ -17,20 +16,20 @@ add_qt_executable(tst_librarymetrics_performance
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "data"
+)
+
 add_qt_resource(tst_librarymetrics_performance "qmake_immediate"
     PREFIX
         "/"
     FILES
-        data
+        ${qmake_immediate_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:librarymetrics_performance.pro:<TRUE>:
-# CONFIG = "benchmark" "release"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:librarymetrics_performance.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt
index 83290b2483..35af3afdf9 100644
--- a/tests/benchmarks/qml/painting/CMakeLists.txt
+++ b/tests/benchmarks/qml/painting/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## painting Binary:
 #####################################################################
 
-add_qt_executable(painting
+add_qt_benchmark(painting
     SOURCES
         paintbenchmark.cpp
     PUBLIC_LIBRARIES
@@ -13,10 +13,7 @@ add_qt_executable(painting
 )
 
 #### Keys ignored in scope 1:.:.:painting.pro:<TRUE>:
-# CONFIG = "console"
+# _REQUIREMENTS = "qtHaveModule(opengl)"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:painting.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
index 83d628265e..60c0f42b78 100644
--- a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qqmlchangeset Binary:
 #####################################################################
 
-add_qt_executable(tst_qqmlchangeset
-    GUI
+add_qt_benchmark(tst_qqmlchangeset
     SOURCES
         tst_qqmlchangeset.cpp
     DEFINES
@@ -20,11 +19,7 @@ add_qt_executable(tst_qqmlchangeset
 )
 
 #### Keys ignored in scope 1:.:.:qqmlchangeset.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qqmlchangeset.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt b/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..cda254fc4d
--- /dev/null
+++ b/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from qqmlcomponent.pro.
+
+#####################################################################
+## tst_qqmlcomponent Binary:
+#####################################################################
+
+add_qt_benchmark(tst_qqmlcomponent
+    SOURCES
+        testtypes.cpp testtypes.h
+        tst_qqmlcomponent.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Qml
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qqmlcomponent.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
diff --git a/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt b/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
index 442d405832..3d980daed5 100644
--- a/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlcomponent Binary:
 #####################################################################
 
-add_qt_executable(tst_qqmlcomponent_benchmark # special case avoid collision with auto test
+add_qt_benchmark(tst_qqmlcomponent_benchmark # special case avoid collision with auto test
     GUI
     SOURCES
         testtypes.cpp testtypes.h
@@ -18,11 +18,7 @@ add_qt_executable(tst_qqmlcomponent_benchmark # special case avoid collision wit
 )
 
 #### Keys ignored in scope 1:.:.:qqmlcomponent.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qqmlcomponent.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt b/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
index 5e4205e1f8..872d676b70 100644
--- a/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qqmlmetaproperty Binary:
 #####################################################################
 
-add_qt_executable(tst_qqmlmetaproperty
-    GUI
+add_qt_benchmark(tst_qqmlmetaproperty
     SOURCES
         tst_qqmlmetaproperty.cpp
     DEFINES
@@ -17,11 +16,7 @@ add_qt_executable(tst_qqmlmetaproperty
 )
 
 #### Keys ignored in scope 1:.:.:qqmlmetaproperty.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qqmlmetaproperty.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
index 192479355a..b9c4569d1b 100644
--- a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
+++ b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qquickwindow Binary:
 #####################################################################
 
-add_qt_executable(tst_qquickwindow
-    GUI
+add_qt_benchmark(tst_qquickwindow
     SOURCES
         tst_qquickwindow.cpp
     DEFINES
@@ -25,13 +24,9 @@ add_qt_executable(tst_qquickwindow
 )
 
 #### Keys ignored in scope 1:.:.:qquickwindow.pro:<TRUE>:
-# CONFIG = "benchmark"
 # DEPLOYMENT = "testDataFiles"
 # testDataFiles.files = "data"
 # testDataFiles.path = "."
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qquickwindow.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/script/CMakeLists.txt b/tests/benchmarks/qml/script/CMakeLists.txt
index bf30b75b5b..8e1941304a 100644
--- a/tests/benchmarks/qml/script/CMakeLists.txt
+++ b/tests/benchmarks/qml/script/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_script Binary:
 #####################################################################
 
-add_qt_executable(tst_script
-    GUI
+add_qt_benchmark(tst_script
     SOURCES
         tst_script.cpp
     DEFINES
@@ -24,11 +23,7 @@ add_qt_executable(tst_script
 )
 
 #### Keys ignored in scope 1:.:.:script.pro:<TRUE>:
-# CONFIG = "benchmark" "release"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:script.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/qml/typeimports/CMakeLists.txt b/tests/benchmarks/qml/typeimports/CMakeLists.txt
index 08a164537f..dd28a9bc0c 100644
--- a/tests/benchmarks/qml/typeimports/CMakeLists.txt
+++ b/tests/benchmarks/qml/typeimports/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_typeimports Binary:
 #####################################################################
 
-add_qt_executable(tst_typeimports
-    GUI
+add_qt_benchmark(tst_typeimports
     SOURCES
         tst_typeimports.cpp
     DEFINES
@@ -17,11 +16,7 @@ add_qt_executable(tst_typeimports
 )
 
 #### Keys ignored in scope 1:.:.:typeimports.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:typeimports.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/benchmarks/quick/events/CMakeLists.txt b/tests/benchmarks/quick/events/CMakeLists.txt
index 0e7041c882..5cd731f9be 100644
--- a/tests/benchmarks/quick/events/CMakeLists.txt
+++ b/tests/benchmarks/quick/events/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_qevents Binary:
 #####################################################################
 
-add_qt_executable(tst_qevents
-    GUI
+add_qt_benchmark(tst_qevents
     SOURCES
         ../../../auto/quick/shared/geometrytestutil.cpp ../../../auto/quick/shared/geometrytestutil.h
         ../../../auto/quick/shared/viewtestutil.cpp ../../../auto/quick/shared/viewtestutil.h
@@ -29,15 +28,11 @@ add_qt_executable(tst_qevents
 )
 
 #### Keys ignored in scope 1:.:.:events.pro:<TRUE>:
-# CONFIG = "benchmark"
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:events.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qevents CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt b/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt
index 8d7928629a..10891b5d2d 100644
--- a/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt
+++ b/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt
@@ -11,6 +11,3 @@ add_qt_executable(evaluate
         # Remove: fsanitize=fuzzer
         Qt::Qml
 )
-
-#### Keys ignored in scope 1:.:.:evaluate.pro:<TRUE>:
-# CONFIG = "console" "-app_bundle"
diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt
index bbd01613c7..13d2d9e189 100644
--- a/tests/manual/highdpi/CMakeLists.txt
+++ b/tests/manual/highdpi/CMakeLists.txt
@@ -1,10 +1,12 @@
 # Generated from highdpi.pro.
 
 #####################################################################
-## qmlimageproviderplugin Plugin:
+## qmlimageproviderplugin Generic Library:
 #####################################################################
 
-add_qt_plugin(qmlimageproviderplugin
+add_cmake_library(qmlimageproviderplugin
+    MODULE
+    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/ImageProvider"
     OUTPUT_DIRECTORY "ImageProvider"
     SOURCES
         imageprovider.cpp
@@ -16,9 +18,10 @@ add_qt_plugin(qmlimageproviderplugin
 )
 
 #### Keys ignored in scope 1:.:.:highdpi.pro:<TRUE>:
-# CONFIG = "plugin"
 # INSTALLS = "target" "qml"
 # TEMPLATE = "lib"
 # qml.files = "ImageProvider/qmldir"
 # qml.path = "$$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider"
 # target.path = "$$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider"
+
+qt_autogen_tools_initial_setup(qmlimageproviderplugin)
diff --git a/tests/manual/httpserver/CMakeLists.txt b/tests/manual/httpserver/CMakeLists.txt
index 61707e145d..7bd972d492 100644
--- a/tests/manual/httpserver/CMakeLists.txt
+++ b/tests/manual/httpserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## httpserver Binary:
 #####################################################################
 
-add_qt_executable(httpserver
+add_qt_manual_test(httpserver
     SOURCES
         ../../auto/shared/testhttpserver.cpp ../../auto/shared/testhttpserver.h
         main.cpp
@@ -15,5 +15,4 @@ add_qt_executable(httpserver
 )
 
 #### Keys ignored in scope 1:.:.:httpserver.pro:<TRUE>:
-# CONFIG = "console" "-app_bundle"
 # TEMPLATE = "app"
diff --git a/tests/manual/mousearea/CMakeLists.txt b/tests/manual/mousearea/CMakeLists.txt
index 631351d035..ca676bc542 100644
--- a/tests/manual/mousearea/CMakeLists.txt
+++ b/tests/manual/mousearea/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mousearea Binary:
 #####################################################################
 
-add_qt_executable(mousearea
+add_qt_manual_test(mousearea
     GUI
     SOURCES
         main.cpp
@@ -15,12 +15,16 @@ add_qt_executable(mousearea
 )
 
 # Resources:
+set(qml_resource_files
+    "main.qml"
+    "plainMouseArea.qml"
+)
+
 add_qt_resource(mousearea "qml"
     PREFIX
         "/"
     FILES
-        main.qml
-        plainMouseArea.qml
+        ${qml_resource_files}
 )
 set_source_files_properties("../../../examples/quick/shared/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
@@ -55,23 +59,27 @@ set_source_files_properties("../../../examples/quick/shared/images/next.png"
 set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
     PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
 )
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
 add_qt_resource(mousearea "quick_shared"
     PREFIX
         "/quick/shared"
     BASE
         "../../../examples/quick/shared"
     FILES
-        Button.qml
-        CheckBox.qml
-        Label.qml
-        LauncherList.qml
-        SimpleLauncherDelegate.qml
-        Slider.qml
-        TextField.qml
-        images/back.png
-        images/checkmark.png
-        images/next.png
-        images/slider_handle.png
+        ${quick_shared_resource_files}
 )
 
 
diff --git a/tests/manual/nodetypes/CMakeLists.txt b/tests/manual/nodetypes/CMakeLists.txt
index 24a4c43b03..1873120aac 100644
--- a/tests/manual/nodetypes/CMakeLists.txt
+++ b/tests/manual/nodetypes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nodetypes Binary:
 #####################################################################
 
-add_qt_executable(nodetypes
+add_qt_manual_test(nodetypes
     GUI
     SOURCES
         nodetypes.cpp
@@ -15,27 +15,31 @@ add_qt_executable(nodetypes
 )
 
 # Resources:
+set(nodetypes_resource_files
+    "Animators.qml"
+    "Effects.qml"
+    "Images.qml"
+    "Layers.qml"
+    "LotsOfImages.qml"
+    "LotsOfRects.qml"
+    "Painter.qml"
+    "Rects.qml"
+    "Text.qml"
+    "face-smile.png"
+    "main.qml"
+    "ps_shadow1.cso"
+    "ps_shadow2.cso"
+    "ps_wobble.cso"
+    "qt.png"
+    "shadow.png"
+    "vs_wobble.cso"
+)
+
 add_qt_resource(nodetypes "nodetypes"
     PREFIX
         "/"
     FILES
-        Animators.qml
-        Effects.qml
-        Images.qml
-        Layers.qml
-        LotsOfImages.qml
-        LotsOfRects.qml
-        Painter.qml
-        Rects.qml
-        Text.qml
-        face-smile.png
-        main.qml
-        ps_shadow1.cso
-        ps_shadow2.cso
-        ps_wobble.cso
-        qt.png
-        shadow.png
-        vs_wobble.cso
+        ${nodetypes_resource_files}
 )
 
 
diff --git a/tests/manual/nodetypes_ng/CMakeLists.txt b/tests/manual/nodetypes_ng/CMakeLists.txt
index 8666cd15bc..81908c69db 100644
--- a/tests/manual/nodetypes_ng/CMakeLists.txt
+++ b/tests/manual/nodetypes_ng/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nodetypes_ng Binary:
 #####################################################################
 
-add_qt_executable(nodetypes_ng
+add_qt_manual_test(nodetypes_ng
     GUI
     SOURCES
         nodetypes_ng.cpp
@@ -15,44 +15,48 @@ add_qt_executable(nodetypes_ng
 )
 
 # Resources:
+set(nodetypes_ng_resource_files
+    "AtlasedImages.qml"
+    "CompressedImages.qml"
+    "DistanceFieldText.qml"
+    "Images.qml"
+    "Layers.qml"
+    "LotsOfNodes.qml"
+    "LotsOfRects.qml"
+    "MoreWindows.qml"
+    "MultiClipRects.qml"
+    "Painter.qml"
+    "Rects.qml"
+    "ShaderEffect.qml"
+    "ShaderEffectNoAnim.qml"
+    "ShaderEffectSource.qml"
+    "SimpleRect.qml"
+    "Text.qml"
+    "arrow-down.png"
+    "arrow-up.png"
+    "blacknwhite.png"
+    "car_etc2_nomips.ktx"
+    "face-smile.png"
+    "main.qml"
+    "minus-sign.png"
+    "plus-sign.png"
+    "qt.png"
+    "qt_bc1_10mips.ktx"
+    "shadow_pass1.frag.qsb"
+    "shadow_pass1_legacy_gl.frag"
+    "shadow_pass2.frag.qsb"
+    "shadow_pass2_legacy_gl.frag"
+    "wobble.frag.qsb"
+    "wobble.vert.qsb"
+    "wobble_legacy_gl.frag"
+    "wobble_legacy_gl.vert"
+)
+
 add_qt_resource(nodetypes_ng "nodetypes_ng"
     PREFIX
         "/"
     FILES
-        AtlasedImages.qml
-        CompressedImages.qml
-        DistanceFieldText.qml
-        Images.qml
-        Layers.qml
-        LotsOfNodes.qml
-        LotsOfRects.qml
-        MoreWindows.qml
-        MultiClipRects.qml
-        Painter.qml
-        Rects.qml
-        ShaderEffect.qml
-        ShaderEffectNoAnim.qml
-        ShaderEffectSource.qml
-        SimpleRect.qml
-        Text.qml
-        arrow-down.png
-        arrow-up.png
-        blacknwhite.png
-        car_etc2_nomips.ktx
-        face-smile.png
-        main.qml
-        minus-sign.png
-        plus-sign.png
-        qt.png
-        qt_bc1_10mips.ktx
-        shadow_pass1.frag.qsb
-        shadow_pass1_legacy_gl.frag
-        shadow_pass2.frag.qsb
-        shadow_pass2_legacy_gl.frag
-        wobble.frag.qsb
-        wobble.vert.qsb
-        wobble_legacy_gl.frag
-        wobble_legacy_gl.vert
+        ${nodetypes_ng_resource_files}
 )
 
 
diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt
index fef6bdafc1..1c70e03f62 100644
--- a/tests/manual/pointer/CMakeLists.txt
+++ b/tests/manual/pointer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pointer Binary:
 #####################################################################
 
-add_qt_executable(pointer
+add_qt_manual_test(pointer
     GUI
     SOURCES
         inputinspector.cpp inputinspector.h
@@ -19,53 +19,57 @@ add_qt_executable(pointer
 )
 
 # Resources:
+set(qml_resource_files
+    "content/CheckBox.qml"
+    "content/FakeFlickable.qml"
+    "content/FlashAnimation.qml"
+    "content/MomentumAnimation.qml"
+    "content/MouseAreaButton.qml"
+    "content/MouseAreaSlider.qml"
+    "content/MouseFeedbackSprite.qml"
+    "content/MptaButton.qml"
+    "content/MultiButton.qml"
+    "content/ScrollBar.qml"
+    "content/Slider.qml"
+    "content/TapHandlerButton.qml"
+    "content/TextBox.qml"
+    "content/TouchpointFeedbackSprite.qml"
+    "fakeFlickable.qml"
+    "flickableWithHandlers.qml"
+    "flingAnimation.qml"
+    "joystick.qml"
+    "main.qml"
+    "map.qml"
+    "map2.qml"
+    "mixer.qml"
+    "multibuttons.qml"
+    "photosurface.qml"
+    "pinchHandler.qml"
+    "pointerDrag.qml"
+    "resources/arrowhead.png"
+    "resources/balloon.png"
+    "resources/fighter.png"
+    "resources/fingersprite.png"
+    "resources/grabbing-location.svg"
+    "resources/joystick-outer-case-pov.jpg"
+    "resources/map.svgz"
+    "resources/missile.png"
+    "resources/mixer-knob.png"
+    "resources/mouse.png"
+    "resources/mouse_left.png"
+    "resources/mouse_middle.png"
+    "resources/mouse_right.png"
+    "resources/redball.png"
+    "sidebar.qml"
+    "singlePointHandlerProperties.qml"
+    "tapHandler.qml"
+)
+
 add_qt_resource(pointer "qml"
     PREFIX
         "/"
     FILES
-        content/CheckBox.qml
-        content/FakeFlickable.qml
-        content/FlashAnimation.qml
-        content/MomentumAnimation.qml
-        content/MouseAreaButton.qml
-        content/MouseAreaSlider.qml
-        content/MouseFeedbackSprite.qml
-        content/MptaButton.qml
-        content/MultiButton.qml
-        content/ScrollBar.qml
-        content/Slider.qml
-        content/TapHandlerButton.qml
-        content/TextBox.qml
-        content/TouchpointFeedbackSprite.qml
-        fakeFlickable.qml
-        flickableWithHandlers.qml
-        flingAnimation.qml
-        joystick.qml
-        main.qml
-        map.qml
-        map2.qml
-        mixer.qml
-        multibuttons.qml
-        photosurface.qml
-        pinchHandler.qml
-        pointerDrag.qml
-        resources/arrowhead.png
-        resources/balloon.png
-        resources/fighter.png
-        resources/fingersprite.png
-        resources/grabbing-location.svg
-        resources/joystick-outer-case-pov.jpg
-        resources/map.svgz
-        resources/missile.png
-        resources/mixer-knob.png
-        resources/mouse.png
-        resources/mouse_left.png
-        resources/mouse_middle.png
-        resources/mouse_right.png
-        resources/redball.png
-        sidebar.qml
-        singlePointHandlerProperties.qml
-        tapHandler.qml
+        ${qml_resource_files}
 )
 set_source_files_properties("../../../examples/quick/shared/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
@@ -100,23 +104,27 @@ set_source_files_properties("../../../examples/quick/shared/images/next.png"
 set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
     PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
 )
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
 add_qt_resource(pointer "quick_shared"
     PREFIX
         "/quick/shared"
     BASE
         "../../../examples/quick/shared"
     FILES
-        Button.qml
-        CheckBox.qml
-        Label.qml
-        LauncherList.qml
-        SimpleLauncherDelegate.qml
-        Slider.qml
-        TextField.qml
-        images/back.png
-        images/checkmark.png
-        images/next.png
-        images/slider_handle.png
+        ${quick_shared_resource_files}
 )
 
 
diff --git a/tests/manual/qmltypememory/CMakeLists.txt b/tests/manual/qmltypememory/CMakeLists.txt
index 4409e4e0e5..faf21c7b13 100644
--- a/tests/manual/qmltypememory/CMakeLists.txt
+++ b/tests/manual/qmltypememory/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmltypememory Binary:
 #####################################################################
 
-add_qt_executable(qmltypememory
+add_qt_manual_test(qmltypememory
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
index f890e46c4e..3c24c3eed8 100644
--- a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
+++ b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Generated from plugin.pro.
 
 #####################################################################
-## testplugin Plugin:
+## testplugin Generic Library:
 #####################################################################
 
-add_qt_plugin(testplugin
+add_cmake_library(testplugin
+    MODULE
     SOURCES
         plugin.cpp
     PUBLIC_LIBRARIES
@@ -14,5 +15,6 @@ add_qt_plugin(testplugin
 )
 
 #### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>:
-# CONFIG = "plugin"
 # TEMPLATE = "lib"
+
+qt_autogen_tools_initial_setup(testplugin)
diff --git a/tests/manual/quickwidgetviewer/CMakeLists.txt b/tests/manual/quickwidgetviewer/CMakeLists.txt
index 19c71890cd..7e53a4cd49 100644
--- a/tests/manual/quickwidgetviewer/CMakeLists.txt
+++ b/tests/manual/quickwidgetviewer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## quickwidgetviewer Binary:
 #####################################################################
 
-add_qt_executable(quickwidgetviewer
+add_qt_manual_test(quickwidgetviewer
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -13,5 +13,4 @@ add_qt_executable(quickwidgetviewer
 )
 
 #### Keys ignored in scope 1:.:.:quickwidgetviewer.pro:<TRUE>:
-# CONFIG = "c++11" "console"
 # TEMPLATE = "app"
diff --git a/tests/manual/scalablepath/CMakeLists.txt b/tests/manual/scalablepath/CMakeLists.txt
index 9eb2d0cc53..bf82a450ec 100644
--- a/tests/manual/scalablepath/CMakeLists.txt
+++ b/tests/manual/scalablepath/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scalablepath Binary:
 #####################################################################
 
-add_qt_executable(scalablepath
+add_qt_manual_test(scalablepath
     GUI
     SOURCES
         main.cpp
@@ -15,15 +15,18 @@ add_qt_executable(scalablepath
 )
 
 # Resources:
+set(qml_resource_files
+    "ShapeTestScale.qml"
+    "main.qml"
+)
+
 add_qt_resource(scalablepath "qml"
     PREFIX
         "/"
     FILES
-        ShapeTestScale.qml
-        main.qml
+        ${qml_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:scalablepath.pro:<TRUE>:
-# CONFIG = "c++11"
 # TEMPLATE = "app"
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
index a237418657..9cf03d738a 100644
--- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlscenegrabber Binary:
 #####################################################################
 
-add_qt_executable(qmlscenegrabber
+add_qt_manual_test(qmlscenegrabber
     OUTPUT_DIRECTORY ".."
     SOURCES
         main.cpp
@@ -13,11 +13,5 @@ add_qt_executable(qmlscenegrabber
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:scenegrabber.pro:<TRUE>:
-# CONFIG = "console"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:scenegrabber.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
index 6f10497ace..3e5dca6d0a 100644
--- a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
@@ -4,6 +4,9 @@
 ## tst_scenegraph Test:
 #####################################################################
 
+# Collect test data
+list(APPEND test_data "../data")
+
 add_qt_test(tst_scenegraph
     OUTPUT_DIRECTORY ".."
     SOURCES
@@ -18,19 +21,17 @@ add_qt_test(tst_scenegraph
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Network
+    TESTDATA ${test_data}
 )
 
 #### Keys ignored in scope 1:.:.:scenegraph.pro:<TRUE>:
-# CONFIG = "testcase" "console"
+# TEST_HELPER_INSTALLS = ".././qmlscenegrabber"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:scenegraph.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 #### Keys ignored in scope 4:.:../../../../../qtbase/tests/baselineserver/shared:../../../../../qtbase/tests/baselineserver/shared/qbaselinetest.pri:WIN32:
-# MKSPEC = "$$replaceQMAKESPEC,\\\\,/"
+# MKSPEC = "$$replace(QMAKESPEC, \\\\, /)"
 
 #### Keys ignored in scope 5:.:../../../../../qtbase/tests/baselineserver/shared:../../../../../qtbase/tests/baselineserver/shared/qbaselinetest.pri:else:
 # MKSPEC = "$$QMAKESPEC"
diff --git a/tests/manual/shapestest/CMakeLists.txt b/tests/manual/shapestest/CMakeLists.txt
index 587f1c596b..e93e16a8ef 100644
--- a/tests/manual/shapestest/CMakeLists.txt
+++ b/tests/manual/shapestest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## shapestest Binary:
 #####################################################################
 
-add_qt_executable(shapestest
+add_qt_manual_test(shapestest
     GUI
     SOURCES
         main.cpp
@@ -15,11 +15,15 @@ add_qt_executable(shapestest
 )
 
 # Resources:
+set(shapestest_resource_files
+    "shapestest.qml"
+)
+
 add_qt_resource(shapestest "shapestest"
     PREFIX
         "/shapestest"
     FILES
-        shapestest.qml
+        ${shapestest_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
index 2e0f5b2d1b..a7137c0ae8 100644
--- a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
+++ b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview_abstracttablemodel Binary:
 #####################################################################
 
-add_qt_executable(tableview_abstracttablemodel
+add_qt_manual_test(tableview_abstracttablemodel
     GUI
     SOURCES
         main.cpp
@@ -15,12 +15,16 @@ add_qt_executable(tableview_abstracttablemodel
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "Button.qml"
+    "main.qml"
+)
+
 add_qt_resource(tableview_abstracttablemodel "qmake_immediate"
     PREFIX
         "/"
     FILES
-        Button.qml
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/listmodel/CMakeLists.txt b/tests/manual/tableview/listmodel/CMakeLists.txt
index bca3bb06b5..bd9297a259 100644
--- a/tests/manual/tableview/listmodel/CMakeLists.txt
+++ b/tests/manual/tableview/listmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview_listmodel Binary:
 #####################################################################
 
-add_qt_executable(tableview_listmodel
+add_qt_manual_test(tableview_listmodel
     GUI
     SOURCES
         main.cpp
@@ -15,11 +15,15 @@ add_qt_executable(tableview_listmodel
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "main.qml"
+)
+
 add_qt_resource(tableview_listmodel "qmake_immediate"
     PREFIX
         "/"
     FILES
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/storagemodel/CMakeLists.txt b/tests/manual/tableview/storagemodel/CMakeLists.txt
index 363c2cf8ba..f920fb28d4 100644
--- a/tests/manual/tableview/storagemodel/CMakeLists.txt
+++ b/tests/manual/tableview/storagemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tableview_storage Binary:
 #####################################################################
 
-add_qt_executable(tableview_storage
+add_qt_manual_test(tableview_storage
     GUI
     SOURCES
         main.cpp
@@ -16,11 +16,15 @@ add_qt_executable(tableview_storage
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "main.qml"
+)
+
 add_qt_resource(tableview_storage "qmake_immediate"
     PREFIX
         "/"
     FILES
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/tablemodel/form/CMakeLists.txt b/tests/manual/tableview/tablemodel/form/CMakeLists.txt
index 5de4ae68b7..2e2af0bbb1 100644
--- a/tests/manual/tableview/tablemodel/form/CMakeLists.txt
+++ b/tests/manual/tableview/tablemodel/form/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## form Binary:
 #####################################################################
 
-add_qt_executable(form
+add_qt_manual_test(form
     GUI
     SOURCES
         main.cpp
@@ -15,12 +15,16 @@ add_qt_executable(form
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "RowForm.qml"
+    "main.qml"
+)
+
 add_qt_resource(form "qmake_immediate"
     PREFIX
         "/"
     FILES
-        RowForm.qml
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/tableview/tablemodel/json/CMakeLists.txt b/tests/manual/tableview/tablemodel/json/CMakeLists.txt
index eeff661a0c..c0b68b2eb6 100644
--- a/tests/manual/tableview/tablemodel/json/CMakeLists.txt
+++ b/tests/manual/tableview/tablemodel/json/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## json Binary:
 #####################################################################
 
-add_qt_executable(json
+add_qt_manual_test(json
     GUI
     SOURCES
         main.cpp
@@ -15,12 +15,16 @@ add_qt_executable(json
 )
 
 # Resources:
+set(qmake_immediate_resource_files
+    "JsonData.js"
+    "main.qml"
+)
+
 add_qt_resource(json "qmake_immediate"
     PREFIX
         "/"
     FILES
-        JsonData.js
-        main.qml
+        ${qmake_immediate_resource_files}
 )
 
 
diff --git a/tests/manual/text/CMakeLists.txt b/tests/manual/text/CMakeLists.txt
index e083a37f4b..69524f4154 100644
--- a/tests/manual/text/CMakeLists.txt
+++ b/tests/manual/text/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## text Binary:
 #####################################################################
 
-add_qt_executable(text
+add_qt_manual_test(text
     GUI
     SOURCES
         main.cpp
@@ -15,13 +15,17 @@ add_qt_executable(text
 )
 
 # Resources:
+set(qml_resource_files
+    "SignalIndicator.qml"
+    "main.qml"
+    "textInputPropertiesAndSignals.qml"
+)
+
 add_qt_resource(text "qml"
     PREFIX
         "/"
     FILES
-        SignalIndicator.qml
-        main.qml
-        textInputPropertiesAndSignals.qml
+        ${qml_resource_files}
 )
 set_source_files_properties("../../../examples/quick/shared/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
@@ -56,23 +60,27 @@ set_source_files_properties("../../../examples/quick/shared/images/next.png"
 set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
     PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
 )
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
 add_qt_resource(text "quick_shared"
     PREFIX
         "/quick/shared"
     BASE
         "../../../examples/quick/shared"
     FILES
-        Button.qml
-        CheckBox.qml
-        Label.qml
-        LauncherList.qml
-        SimpleLauncherDelegate.qml
-        Slider.qml
-        TextField.qml
-        images/back.png
-        images/checkmark.png
-        images/next.png
-        images/slider_handle.png
+        ${quick_shared_resource_files}
 )
 
 
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
index 040ac91607..d3d7a1e749 100644
--- a/tests/manual/touch/CMakeLists.txt
+++ b/tests/manual/touch/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## touch Binary:
 #####################################################################
 
-add_qt_executable(touch
+add_qt_manual_test(touch
     GUI
     SOURCES
         main.cpp
@@ -15,13 +15,17 @@ add_qt_executable(touch
 )
 
 # Resources:
+set(qml_resource_files
+    "flicktext.qml"
+    "main.qml"
+    "mpta-crosshairs.qml"
+)
+
 add_qt_resource(touch "qml"
     PREFIX
         "/"
     FILES
-        flicktext.qml
-        main.qml
-        mpta-crosshairs.qml
+        ${qml_resource_files}
 )
 set_source_files_properties("../../../examples/quick/shared/Button.qml"
     PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
@@ -56,23 +60,27 @@ set_source_files_properties("../../../examples/quick/shared/images/next.png"
 set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
     PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
 )
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
 add_qt_resource(touch "quick_shared"
     PREFIX
         "/quick/shared"
     BASE
         "../../../examples/quick/shared"
     FILES
-        Button.qml
-        CheckBox.qml
-        Label.qml
-        LauncherList.qml
-        SimpleLauncherDelegate.qml
-        Slider.qml
-        TextField.qml
-        images/back.png
-        images/checkmark.png
-        images/next.png
-        images/slider_handle.png
+        ${quick_shared_resource_files}
 )
 
 
diff --git a/tests/manual/v4/auto/executableallocator/CMakeLists.txt b/tests/manual/v4/auto/executableallocator/CMakeLists.txt
index fd609bfeac..7b571171d6 100644
--- a/tests/manual/v4/auto/executableallocator/CMakeLists.txt
+++ b/tests/manual/v4/auto/executableallocator/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_executableallocator Binary:
 #####################################################################
 
-add_qt_executable(tst_executableallocator
-    GUI
+add_qt_manual_test(tst_executableallocator
     SOURCES
         tst_executableallocator.cpp
     LIBRARIES