Regenerate remaining tests to be in sync

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

40 files changed, 164 insertions, 180 deletions

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"