Regenerate all projects with new CMake API version

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

40 files changed, 40 insertions, 40 deletions

diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
index 7d96a54a8e..d03442b163 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidFirstCommandModule Generic Library:
 #####################################################################
 
-add_cmake_library(invalidFirstCommandModule
+qt_add_cmake_library(invalidFirstCommandModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
index 3f318abfc3..6bb1cbb689 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidFirstCommandModule Generic Library:
 #####################################################################
 
-add_cmake_library(invalidFirstCommandModule
+qt_add_cmake_library(invalidFirstCommandModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
index 58c1347556..bf9ed44b68 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidNamespaceModule Generic Library:
 #####################################################################
 
-add_cmake_library(invalidNamespaceModule
+qt_add_cmake_library(invalidNamespaceModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
index 3ec16a1007..416916a9c8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidNamespaceModule Generic Library:
 #####################################################################
 
-add_cmake_library(invalidNamespaceModule
+qt_add_cmake_library(invalidNamespaceModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
index 01d30f29a1..59bc23604e 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nestedPlugin Generic Library:
 #####################################################################
 
-add_cmake_library(nestedPlugin
+qt_add_cmake_library(nestedPlugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType"
     SOURCES
         nestedPlugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
index b925765217..ea035b9815 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nestedPlugin Generic Library:
 #####################################################################
 
-add_cmake_library(nestedPlugin
+qt_add_cmake_library(nestedPlugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType"
     SOURCES
         nestedPlugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
index f055b4d374..793ef68eb8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nonstrictModule Generic Library:
 #####################################################################
 
-add_cmake_library(nonstrictModule
+qt_add_cmake_library(nonstrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
index 32b4393d71..6739b18c53 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nonstrictModule Generic Library:
 #####################################################################
 
-add_cmake_library(nonstrictModule
+qt_add_cmake_library(nonstrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule"
     SOURCES
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 bd8c267456..0ace521a5d 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2.1 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2.1
+qt_add_cmake_library(plugin.2.1
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
index c33407a619..5f008737f7 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2.1 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2.1
+qt_add_cmake_library(plugin.2.1
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1"
     SOURCES
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 fa11a4f0dc..caa119c2d3 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
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin"
     SOURCES
         childplugin.cpp
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 61ab84a7f6..8cb9cc3740 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin.2.1 # special case
+qt_add_cmake_library(childplugin.2.1 # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin"
     SOURCES
         childplugin.cpp
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 9bb54a6baf..8d344ca55a 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2.2 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2.2
+qt_add_cmake_library(plugin.2.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
index f5e24fa991..48ebf86a07 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2.2 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2.2
+qt_add_cmake_library(plugin.2.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
index 9cd696fa03..ece805b2a8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2
+qt_add_cmake_library(plugin.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
index aafa7fd17e..c1827202e0 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2
+qt_add_cmake_library(plugin.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2"
     SOURCES
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 24c06ade06..7446fa49c3 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
index d4d64577ce..ebf8b65f38 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin.2 # special case
+qt_add_cmake_library(childplugin.2 # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
index ecd463389b..f9f5f1ea92 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin Generic Library:
 #####################################################################
 
-add_cmake_library(plugin
+qt_add_cmake_library(plugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
index 3d9f1e6da2..ced3e394bc 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin Generic Library:
 #####################################################################
 
-add_cmake_library(plugin
+qt_add_cmake_library(plugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
index 2037c70f28..ff70bc3f61 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
index eb3964a0c3..0490d76d80 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
index 2cf70361dc..651a4e124b 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginMixed Generic Library:
 #####################################################################
 
-add_cmake_library(pluginMixed
+qt_add_cmake_library(pluginMixed
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
index ce2b0a7cf0..a31f9d7a91 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginMixed Generic Library:
 #####################################################################
 
-add_cmake_library(pluginMixed
+qt_add_cmake_library(pluginMixed
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
index b5ea40704a..fe49c797b4 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginVersion Generic Library:
 #####################################################################
 
-add_cmake_library(pluginVersion
+qt_add_cmake_library(pluginVersion
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
index b3f448f669..2c7d69e408 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginVersion Generic Library:
 #####################################################################
 
-add_cmake_library(pluginVersion
+qt_add_cmake_library(pluginVersion
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
index 5cf3bde36d..825d30bea9 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginWithQmlFile Generic Library:
 #####################################################################
 
-add_cmake_library(pluginWithQmlFile
+qt_add_cmake_library(pluginWithQmlFile
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
index 7cb468c169..29fa258de8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginWithQmlFile Generic Library:
 #####################################################################
 
-add_cmake_library(pluginWithQmlFile
+qt_add_cmake_library(pluginWithQmlFile
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
index 0a8844b169..94e7013e32 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Plugin Generic Library:
 #####################################################################
 
-add_cmake_library(Plugin
+qt_add_cmake_library(Plugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
index 8ceb2efa99..b14b40fd78 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Plugin Generic Library:
 #####################################################################
 
-add_cmake_library(Plugin
+qt_add_cmake_library(Plugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
index dd74064201..9b37de6443 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptedStrictModule Generic Library:
 #####################################################################
 
-add_cmake_library(preemptedStrictModule
+qt_add_cmake_library(preemptedStrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
index fe4517571a..7068f51f03 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptedStrictModule Generic Library:
 #####################################################################
 
-add_cmake_library(preemptedStrictModule
+qt_add_cmake_library(preemptedStrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
index a436682442..5ed3768a75 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptiveModule Generic Library:
 #####################################################################
 
-add_cmake_library(preemptiveModule
+qt_add_cmake_library(preemptiveModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
index c2510ec868..7e8b4d0739 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptiveModule Generic Library:
 #####################################################################
 
-add_cmake_library(preemptiveModule
+qt_add_cmake_library(preemptiveModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
index dfd26339ee..65b4d1bc40 100644
--- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## protectedModule Generic Library:
 #####################################################################
 
-add_cmake_library(protectedModule
+qt_add_cmake_library(protectedModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
index 8522d435b2..be50685c09 100644
--- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## protectedModule Generic Library:
 #####################################################################
 
-add_cmake_library(protectedModule
+qt_add_cmake_library(protectedModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
index ee29087a5d..d57f762100 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule.2 Generic Library:
 #####################################################################
 
-add_cmake_library(strictModule.2
+qt_add_cmake_library(strictModule.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
index 6a5aecfc1f..6229b9efaf 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule.2 Generic Library:
 #####################################################################
 
-add_cmake_library(strictModule.2
+qt_add_cmake_library(strictModule.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
index 299812ecdb..d76e1600ae 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule Generic Library:
 #####################################################################
 
-add_cmake_library(strictModule
+qt_add_cmake_library(strictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
index 690ab0b48b..4a5a79be4d 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule Generic Library:
 #####################################################################
 
-add_cmake_library(strictModule
+qt_add_cmake_library(strictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule"
     SOURCES