CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.

Task-number: QTBUG-86815
Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

46 files changed, 56 insertions, 56 deletions

diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
index 6b240a9291..fdaa0e2eda 100644
--- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
@@ -18,7 +18,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_BINARY_DIR}/imports/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlmoduleplugin
+qt_internal_add_test(tst_qqmlmoduleplugin
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -39,7 +39,7 @@ set(qmake_waitingPlugin_resource_files
     "moduleWithWaitingPlugin"
 )
 
-qt_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
+qt_internal_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
@@ -49,7 +49,7 @@ set(qmake_staticPlugin_resource_files
     "moduleWithStaticPlugin"
 )
 
-qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
+qt_internal_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
@@ -60,12 +60,12 @@ qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
index 2fcce3d7c9..58a52919ea 100644
--- a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
@@ -18,7 +18,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_BINARY_DIR}/imports/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlmoduleplugin
+qt_internal_add_test(tst_qqmlmoduleplugin
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -39,7 +39,7 @@ set(qmake_waitingPlugin_resource_files
     "moduleWithWaitingPlugin"
 )
 
-qt_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
+qt_internal_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
@@ -49,7 +49,7 @@ set(qmake_staticPlugin_resource_files
     "moduleWithStaticPlugin"
 )
 
-qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
+qt_internal_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
@@ -65,11 +65,11 @@ qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
 # waitingPlugin.prefix = "/qt-project.org/imports/"
 
 # special case begin
-add_qt_resource(tst_qqmlmoduleplugin waitingPlugin
+qt_internal_add_resource(tst_qqmlmoduleplugin waitingPlugin
     PREFIX /qt-project.org/imports
     FILES moduleWithWaitingPlugin/qmldir
 )
-add_qt_resource(tst_qqmlmoduleplugin staticPlugin
+qt_internal_add_resource(tst_qqmlmoduleplugin staticPlugin
     PREFIX /qt-project.org/imports
     FILES moduleWithStaticPlugin/qmldir
 )
@@ -78,12 +78,12 @@ add_qt_resource(tst_qqmlmoduleplugin staticPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
index d337235cd8..874c639f2b 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:
 #####################################################################
 
-qt_add_cmake_library(invalidFirstCommandModule
+qt_internal_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 c580c9d517..d40bc750fd 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidFirstCommandModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(invalidFirstCommandModule
+qt_internal_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 9c762abc48..f32cbc8184 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:
 #####################################################################
 
-qt_add_cmake_library(invalidNamespaceModule
+qt_internal_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 a223ecffbf..4b65f8eff4 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidNamespaceModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(invalidNamespaceModule
+qt_internal_add_cmake_library(invalidNamespaceModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt
index f420295e84..e773de357a 100644
--- a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## moduleWithQmlSingleton Generic Library:
 #####################################################################
 
-qt_add_cmake_library(moduleWithQmlSingleton
+qt_internal_add_cmake_library(moduleWithQmlSingleton
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ModuleWithQmlSingleton"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt
index e0f8f3043a..d96bff4a57 100644
--- a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## moduleWithQmlSingleton Generic Library:
 #####################################################################
 
-qt_add_cmake_library(moduleWithQmlSingleton
+qt_internal_add_cmake_library(moduleWithQmlSingleton
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ModuleWithQmlSingleton"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
index 8a5bfaab59..03094effc4 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:
 #####################################################################
 
-qt_add_cmake_library(nestedPlugin
+qt_internal_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 ce87292240..4fe48abcfd 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nestedPlugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(nestedPlugin
+qt_internal_add_cmake_library(nestedPlugin
     MODULE # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
index fd9a4a9038..24487bf4d5 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:
 #####################################################################
 
-qt_add_cmake_library(nonstrictModule
+qt_internal_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 c871907e01..3abece32e1 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nonstrictModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(nonstrictModule
+qt_internal_add_cmake_library(nonstrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/.prev_CMakeLists.txt
index 375ade482a..cba807561e 100644
--- a/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## optionalPlugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(optionalPlugin
+qt_internal_add_cmake_library(optionalPlugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/QtQuick/Shapes"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/CMakeLists.txt
index 49b2bce8b7..8a73cfc824 100644
--- a/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/optionalPlugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## optionalPlugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(optionalPlugin
+qt_internal_add_cmake_library(optionalPlugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/QtQuick/Shapes"
     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 8bb52a6323..6bc535d7ac 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:
 #####################################################################
 
-qt_add_cmake_library(plugin.2.1
+qt_internal_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 9d1f1c1ca8..2511795326 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:
 #####################################################################
 
-qt_add_cmake_library(plugin.2.1
+qt_internal_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 d945c031cb..e58ad65a99 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:
 #####################################################################
 
-qt_add_cmake_library(childplugin
+qt_internal_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 d68158d95f..dd75406df6 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:
 #####################################################################
 
-qt_add_cmake_library(childplugin.2.1 # special case
+qt_internal_add_cmake_library(childplugin.2.1 # special case
     MODULE # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin"
     SOURCES
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 b4af645c81..f0920e6242 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:
 #####################################################################
 
-qt_add_cmake_library(plugin.2.2
+qt_internal_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 e2b36e8f09..d301ed48a6 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:
 #####################################################################
 
-qt_add_cmake_library(plugin.2.2
+qt_internal_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 1cbd74d97a..3d13df1e68 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:
 #####################################################################
 
-qt_add_cmake_library(plugin.2
+qt_internal_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 0a546866de..f740919f33 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:
 #####################################################################
 
-qt_add_cmake_library(plugin.2
+qt_internal_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 036b2237a5..2993a0e429 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:
 #####################################################################
 
-qt_add_cmake_library(childplugin
+qt_internal_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 d7675ba6f1..140f2d4bed 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:
 #####################################################################
 
-qt_add_cmake_library(childplugin.2 # special case
+qt_internal_add_cmake_library(childplugin.2 # special case
     MODULE # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
index 4de3788caa..e295d5a8ea 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:
 #####################################################################
 
-qt_add_cmake_library(plugin
+qt_internal_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 50e30ecf09..7537a70028 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(plugin
+qt_internal_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 e137159431..a79d00a016 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:
 #####################################################################
 
-qt_add_cmake_library(childplugin
+qt_internal_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 962471f304..ddd9794339 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:
 #####################################################################
 
-qt_add_cmake_library(childplugin
+qt_internal_add_cmake_library(childplugin
     MODULE # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
index 0d27da3434..be502cd3c7 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:
 #####################################################################
 
-qt_add_cmake_library(pluginMixed
+qt_internal_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 967868a674..3638d93cd4 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginMixed Generic Library:
 #####################################################################
 
-qt_add_cmake_library(pluginMixed
+qt_internal_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 278d100ed9..4a98877528 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:
 #####################################################################
 
-qt_add_cmake_library(pluginVersion
+qt_internal_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 7e58ea3b18..e3be81a837 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginVersion Generic Library:
 #####################################################################
 
-qt_add_cmake_library(pluginVersion
+qt_internal_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 7db53592e1..f37b45d5a0 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:
 #####################################################################
 
-qt_add_cmake_library(pluginWithQmlFile
+qt_internal_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 ad21516b1c..dc0a1142ba 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginWithQmlFile Generic Library:
 #####################################################################
 
-qt_add_cmake_library(pluginWithQmlFile
+qt_internal_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 93a10a2169..1eb7e6a784 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:
 #####################################################################
 
-qt_add_cmake_library(Plugin
+qt_internal_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 7938f93465..351d2a4c5e 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Plugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Plugin
+qt_internal_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 1e803e65af..10bd25cda3 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:
 #####################################################################
 
-qt_add_cmake_library(preemptedStrictModule
+qt_internal_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 2c13ea8aa6..ef278f139f 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptedStrictModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(preemptedStrictModule
+qt_internal_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 3addc1aacb..ae55a4a81f 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:
 #####################################################################
 
-qt_add_cmake_library(preemptiveModule
+qt_internal_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 d473bff09c..1d91354aaa 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptiveModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(preemptiveModule
+qt_internal_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 5ff2840aef..3ee6865ded 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:
 #####################################################################
 
-qt_add_cmake_library(protectedModule
+qt_internal_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 24da9a078e..bb5b270a30 100644
--- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## protectedModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(protectedModule
+qt_internal_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 d832421c8f..c8d51ce4ea 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:
 #####################################################################
 
-qt_add_cmake_library(strictModule.2
+qt_internal_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 9b69cf90ca..1e976b06c8 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:
 #####################################################################
 
-qt_add_cmake_library(strictModule.2
+qt_internal_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 f8bb888bd9..ff1f47e336 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:
 #####################################################################
 
-qt_add_cmake_library(strictModule
+qt_internal_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 d3013fef73..341e147ebe 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(strictModule
+qt_internal_add_cmake_library(strictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule"
     SOURCES