CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.

Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

26 files changed, 48 insertions, 89 deletions

diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
index 2eaac94408..247c905d9e 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin1 Generic Library:
 #####################################################################
 
-qt_add_cmake_library(plugin1
+qt_internal_add_cmake_library(plugin1
     MODULE
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ qt_add_cmake_library(plugin1
 ## Scopes:
 #####################################################################
 
-qt_extend_target(plugin1 CONDITION NOT QT_FEATURE_library
+qt_internal_extend_target(plugin1 CONDITION NOT QT_FEATURE_library
     DEFINES
         QT_STATICPLUGIN
 )
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
index 0e0c589fc1..a384a40412 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin2 Generic Library:
 #####################################################################
 
-qt_add_cmake_library(plugin2
+qt_internal_add_cmake_library(plugin2
     MODULE
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ qt_add_cmake_library(plugin2
 ## Scopes:
 #####################################################################
 
-qt_extend_target(plugin2 CONDITION NOT QT_FEATURE_library
+qt_internal_extend_target(plugin2 CONDITION NOT QT_FEATURE_library
     DEFINES
         QT_STATICPLUGIN
 )
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
index 9e3a686340..8b781536a4 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfactoryloader Test:
 #####################################################################
 
-qt_add_test(tst_qfactoryloader
+qt_internal_add_test(tst_qfactoryloader
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../plugin1/plugininterface1.h
@@ -17,7 +17,7 @@ qt_add_test(tst_qfactoryloader
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
+qt_internal_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
     PUBLIC_LIBRARIES
         # Remove: L
         ../bin/
@@ -31,7 +31,7 @@ if(ANDROID)
         ${CMAKE_CURRENT_BINARY_DIR}/../bin
     )
 
-    qt_add_resource(tst_qfactoryloader "qmake_libs"
+    qt_internal_add_resource(tst_qfactoryloader "qmake_libs"
         PREFIX
             "android_test_data"
         BASE
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
index 7d10294399..8515af2beb 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfactoryloader Test:
 #####################################################################
 
-qt_add_test(tst_qfactoryloader
+qt_internal_add_test(tst_qfactoryloader
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../plugin1/plugininterface1.h
@@ -23,7 +23,7 @@ if (NOT QT_FEATURE_library)
 endif()
 # special case end
 
-qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
+qt_internal_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
     PUBLIC_LIBRARIES
         # Remove: L
         # special case begin
@@ -57,7 +57,7 @@ if(ANDROID)
     endif()
     # special case end
 
-    qt_add_resource(tst_qfactoryloader "qmake_libs"
+    qt_internal_add_resource(tst_qfactoryloader "qmake_libs"
         PREFIX
             "android_test_data"
         BASE
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
index b1435b77d3..93a2b1a455 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mylib Generic Library:
 #####################################################################
 
-qt_add_cmake_library(mylib
+qt_internal_add_cmake_library(mylib
     SHARED
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
@@ -22,7 +22,7 @@ qt_add_cmake_library(mylib
 ## Scopes:
 #####################################################################
 
-qt_extend_target(mylib CONDITION MSVC
+qt_internal_extend_target(mylib CONDITION MSVC
     DEFINES
         WIN32_MSVC
 )
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
index 41bd6bf252..4b2e01d997 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mylib Generic Library:
 #####################################################################
 
-qt_add_cmake_library(mylib
+qt_internal_add_cmake_library(mylib
     SHARED
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
@@ -37,7 +37,7 @@ endif()
 ## Scopes:
 #####################################################################
 
-qt_extend_target(mylib CONDITION MSVC
+qt_internal_extend_target(mylib CONDITION MSVC
     DEFINES
         WIN32_MSVC
 )
diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt
index a91b99f1c2..f92cec8fb1 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mylib Generic Library:
 #####################################################################
 
-add_cmake_library(mylib2 # special case
+qt_internal_add_cmake_library(mylib2 # special case
     SHARED
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}tst_qlibrary"
     #OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
@@ -84,7 +84,7 @@ endif()
 ## Scopes:
 #####################################################################
 
-extend_target(mylib2 CONDITION MSVC # special case
+qt_internal_extend_target(mylib2 CONDITION MSVC # special case
     DEFINES
         WIN32_MSVC
 )
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
index c3af98df13..6e4ce15f44 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "../library_path/invalid.so")
 
-qt_add_test(tst_qlibrary
+qt_internal_add_test(tst_qlibrary
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qlibrary.cpp
@@ -26,7 +26,7 @@ if(ANDROID)
         ${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.so
     )
 
-    qt_add_resource(tst_qlibrary "qmake_libs"
+    qt_internal_add_resource(tst_qlibrary "qmake_libs"
         PREFIX
             "android_test_data"
         BASE
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
index a99b96c806..0f18c8dccc 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "../library_path/invalid.so")
 
-qt_add_test(tst_qlibrary
+qt_internal_add_test(tst_qlibrary
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qlibrary.cpp
@@ -39,7 +39,7 @@ if(ANDROID)
         # special case end
     )
 
-    qt_add_resource(tst_qlibrary "qmake_libs"
+    qt_internal_add_resource(tst_qlibrary "qmake_libs"
         PREFIX
             "android_test_data"
         BASE
diff --git a/tests/auto/corelib/plugin/qplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/CMakeLists.txt
index b2829099aa..2c901eff44 100644
--- a/tests/auto/corelib/plugin/qplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/CMakeLists.txt
@@ -13,7 +13,7 @@ file(GLOB_RECURSE test_data_glob
     plugins/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qplugin
+qt_internal_add_test(tst_qplugin
     SOURCES
         tst_qplugin.cpp
     LIBRARIES
diff --git a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
index 379faad981..ee4c0cf33c 100644
--- a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## debugplugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(debugplugin
+qt_internal_add_cmake_library(debugplugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
     SOURCES
diff --git a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
index 0dc5a28edb..b9cdf2af05 100644
--- a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidplugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(invalidplugin
+qt_internal_add_cmake_library(invalidplugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
     SOURCES
diff --git a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
index 0332bcc15b..abf3ae2a4d 100644
--- a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## releaseplugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(releaseplugin
+qt_internal_add_cmake_library(releaseplugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
     SOURCES
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
index 64b1db677d..899ad6ca39 100644
--- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## almostplugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(almostplugin
+qt_internal_add_cmake_library(almostplugin
     MODULE
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ qt_add_cmake_library(almostplugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(almostplugin CONDITION GCC
+qt_internal_extend_target(almostplugin CONDITION GCC
     LINK_OPTIONS
         "--Wl,--no-undefined"
 )
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
index c8a320d2cf..fe5d6295aa 100644
--- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## almostplugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(almostplugin
+qt_internal_add_cmake_library(almostplugin
     MODULE
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -25,7 +25,7 @@ qt_add_cmake_library(almostplugin
 qt_autogen_tools_initial_setup(almostplugin)
 # special case begin
 # We want the opposite of this
-#qt_extend_target(almostplugin CONDITION GCC
+#qt_internal_extend_target(almostplugin CONDITION GCC
 #    LINK_OPTIONS
 #        "--Wl,--no-undefined"
 #)
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
index b5ae34e9df..61de9dd479 100644
--- a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpluginloaderlib Generic Library:
 #####################################################################
 
-qt_add_cmake_library(tst_qpluginloaderlib
+qt_internal_add_cmake_library(tst_qpluginloaderlib
     SHARED
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -22,7 +22,7 @@ qt_add_cmake_library(tst_qpluginloaderlib
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpluginloaderlib CONDITION MSVC
+qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC
     DEFINES
         WIN32_MSVC
 )
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
index f760ce9935..7914f07c0d 100644
--- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpluginloaderlib Generic Library:
 #####################################################################
 
-qt_add_cmake_library(tst_qpluginloaderlib
+qt_internal_add_cmake_library(tst_qpluginloaderlib
     SHARED
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@@ -29,7 +29,7 @@ endif()
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpluginloaderlib CONDITION MSVC
+qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC
     DEFINES
         WIN32_MSVC
 )
diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt
index bfc30d7c1d..1448ff3933 100644
--- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## staticplugin Generic Library:
 #####################################################################
 
-add_cmake_library(staticplugin
+qt_internal_add_cmake_library(staticplugin
     STATIC
     SOURCES
         main.cpp
@@ -21,3 +21,5 @@ add_cmake_library(staticplugin
 # TEMPLATE = "lib"
 
 qt_autogen_tools_initial_setup(staticplugin)
+
+target_compile_definitions(staticplugin PRIVATE QT_STATICPLUGIN)
diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
index 0eb42728f4..1448ff3933 100644
--- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## staticplugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(staticplugin
+qt_internal_add_cmake_library(staticplugin
     STATIC
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
index ef39d6cc0f..5a8bf518c5 100644
--- a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## theplugin Generic Library:
 #####################################################################
 
-qt_add_cmake_library(theplugin
+qt_internal_add_cmake_library(theplugin
     MODULE
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
deleted file mode 100644
index 0b0d76bbc4..0000000000
--- a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated from tst.pro.
-
-#####################################################################
-## tst_qpluginloader Test:
-#####################################################################
-
-# Collect test data
-list(APPEND test_data "../elftest")
-list(APPEND test_data "../machtest")
-
-qt_add_test(tst_qpluginloader
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
-    SOURCES
-        ../fakeplugin.cpp
-        ../theplugin/plugininterface.h
-        ../tst_qpluginloader.cpp
-    PUBLIC_LIBRARIES
-        staticplugin
-    TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-)
-
-qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
-    PUBLIC_LIBRARIES
-        # Remove: L../staticplugin/debug
-)
-
-qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
-    PUBLIC_LIBRARIES
-        # Remove: L../staticplugin/release
-)
-
-qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
-    PUBLIC_LIBRARIES
-        # Remove: L../staticplugin
-)
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
index 0b0d76bbc4..1193a9d731 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "../elftest")
 list(APPEND test_data "../machtest")
 
-qt_add_test(tst_qpluginloader
+qt_internal_add_test(tst_qpluginloader
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../fakeplugin.cpp
@@ -22,22 +22,22 @@ qt_add_test(tst_qpluginloader
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
+qt_internal_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
     PUBLIC_LIBRARIES
         Qt::CorePrivate
 )
 
-qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
+qt_internal_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
     PUBLIC_LIBRARIES
         # Remove: L../staticplugin/debug
 )
 
-qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+qt_internal_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
     PUBLIC_LIBRARIES
         # Remove: L../staticplugin/release
 )
 
-qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
+qt_internal_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
     PUBLIC_LIBRARIES
         # Remove: L../staticplugin
 )
diff --git a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
index 05ed8f84ac..5e0aec0f33 100644
--- a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_quuid Test:
 #####################################################################
 
-qt_add_test(tst_quuid
+qt_internal_add_test(tst_quuid
     SOURCES
         ../tst_quuid.cpp
 )
@@ -12,7 +12,7 @@ qt_add_test(tst_quuid
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_quuid CONDITION APPLE
+qt_internal_extend_target(tst_quuid CONDITION APPLE
     SOURCES
         ../tst_quuid_darwin.mm
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
index 1ba9de95ca..51712cfc05 100644
--- a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_quuid Test:
 #####################################################################
 
-qt_add_test(tst_quuid
+qt_internal_add_test(tst_quuid
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
     SOURCES
         ../tst_quuid.cpp
@@ -13,7 +13,7 @@ qt_add_test(tst_quuid
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_quuid CONDITION APPLE
+qt_internal_extend_target(tst_quuid CONDITION APPLE
     SOURCES
         ../tst_quuid_darwin.mm
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt
index eaa9d4e281..e1b5814f41 100644
--- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessUniqueness Binary:
 #####################################################################
 
-qt_add_executable(testProcessUniqueness
+qt_internal_add_executable(testProcessUniqueness
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_quuid/testProcessUniqueness"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt
index ad5192261d..0bdf32a207 100644
--- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessUniqueness Binary:
 #####################################################################
 
-qt_add_executable(testProcessUniqueness
+qt_internal_add_executable(testProcessUniqueness
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_quuid/testProcessUniqueness"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES