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>
author: Alexandru Croitor <alexandru.croitor@qt.io> 2020-09-22 15:23:08 +0200
committer: Alexandru Croitor <alexandru.croitor@qt.io> 2020-10-06 13:19:37 +0200
commit: 08adbefa131ef1c934f55cd61716c8ea836ddf02 (patch)
tree: 0ae21548926596fb41e7e71c4bb14d1973245bde /tests/auto/qml
parent: c52a857c2b6b89abeddeee8489110ab9dd363e53 (diff)
171 files changed, 356 insertions, 356 deletions
diff --git a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
index 638540fab3..eb70a77bfd 100644
--- a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractanimationjob Test:
 #####################################################################
 
-qt_add_test(tst_qabstractanimationjob
+qt_internal_add_test(tst_qabstractanimationjob
     SOURCES
         tst_qabstractanimationjob.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
index 54c1abb691..e7b979decb 100644
--- a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qanimationgroupjob Test:
 #####################################################################
 
-qt_add_test(tst_qanimationgroupjob
+qt_internal_add_test(tst_qanimationgroupjob
     SOURCES
         tst_qanimationgroupjob.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
index ba64d8cf0e..07ef4c2224 100644
--- a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qparallelanimationgroupjob Test:
 #####################################################################
 
-qt_add_test(tst_qparallelanimationgroupjob
+qt_internal_add_test(tst_qparallelanimationgroupjob
     SOURCES
         tst_qparallelanimationgroupjob.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
index a1d07be77c..c63d3e936a 100644
--- a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpauseanimationjob Test:
 #####################################################################
 
-qt_add_test(tst_qpauseanimationjob
+qt_internal_add_test(tst_qpauseanimationjob
     SOURCES
         tst_qpauseanimationjob.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
index b675121510..54da6e6569 100644
--- a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsequentialanimationgroupjob Test:
 #####################################################################
 
-qt_add_test(tst_qsequentialanimationgroupjob
+qt_internal_add_test(tst_qsequentialanimationgroupjob
     SOURCES
         tst_qsequentialanimationgroupjob.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
index 60e58bb08f..775160e4c5 100644
--- a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
+++ b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_bindingdependencyapi
+qt_internal_add_test(tst_bindingdependencyapi
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_bindingdependencyapi.cpp
@@ -28,12 +28,12 @@ qt_add_test(tst_bindingdependencyapi
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_bindingdependencyapi CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_bindingdependencyapi CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
index bc1d98bfb9..3ad886b0ad 100644
--- a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qdebugmessageservice
+qt_internal_add_test(tst_qdebugmessageservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -34,12 +34,12 @@ qt_add_test(tst_qdebugmessageservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qdebugmessageservice CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qdebugmessageservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
index 390cc30d0f..3ab44c2670 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpacketprotocol Test:
 #####################################################################
 
-qt_add_test(tst_qpacketprotocol
+qt_internal_add_test(tst_qpacketprotocol
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -24,12 +24,12 @@ qt_add_test(tst_qpacketprotocol
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpacketprotocol CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qpacketprotocol CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
index dfdaadb869..86009707a9 100644
--- a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmldebugclient Test:
 #####################################################################
 
-qt_add_test(tst_qqmldebugclient
+qt_internal_add_test(tst_qqmldebugclient
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmldebugclient
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebugclient CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmldebugclient CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
index 1bdc1ec192..8b3f0b6d5c 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmldebuggingenabler Test:
 #####################################################################
 
-qt_add_test(tst_qqmldebuggingenabler
+qt_internal_add_test(tst_qqmldebuggingenabler
     SOURCES
         ../../../../shared/util.cpp ../../../../shared/util.h
         ../../shared/debugutil.cpp ../../shared/debugutil_p.h
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmldebuggingenabler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
index 818e639fb5..fda8f11cc6 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebuggingenablerserver Binary:
 #####################################################################
 
-qt_add_executable(qqmldebuggingenablerserver
+qt_internal_add_executable(qqmldebuggingenablerserver
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebuggingenabler"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler"
     SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
index 16dfb7b494..0df1846e22 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebuggingenablerserver Binary:
 #####################################################################
 
-qt_add_executable(qqmldebuggingenablerserver
+qt_internal_add_executable(qqmldebuggingenablerserver
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler"
     # special case begin
     # Remove INSTALL_DIRECTORY with $$[QT_INSTALL_TESTS]
diff --git a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
index 11d16879ed..99a885589e 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmldebugjs
+qt_internal_add_test(tst_qqmldebugjs
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -33,12 +33,12 @@ qt_add_test(tst_qqmldebugjs
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebugjs CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmldebugjs CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
index 7d82431f5d..12c3c5b4d3 100644
--- a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebugjsserver Binary:
 #####################################################################
 
-qt_add_executable(qqmldebugjsserver
+qt_internal_add_executable(qqmldebugjsserver
     OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
     SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
index 605ad3562e..bbab6d9da2 100644
--- a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebugjsserver Binary:
 #####################################################################
 
-qt_add_executable(qqmldebugjsserver
+qt_internal_add_executable(qqmldebugjsserver
     # special case begin
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     # INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
diff --git a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
index 2b25248b0b..80836f5f6a 100644
--- a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmldebuglocal Test:
 #####################################################################
 
-qt_add_test(tst_qqmldebuglocal
+qt_internal_add_test(tst_qqmldebuglocal
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmldebuglocal
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebuglocal CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmldebuglocal CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
index a98a809c7b..d4f1ce48ab 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmldebugprocess Test:
 #####################################################################
 
-qt_add_test(tst_qqmldebugprocess
+qt_internal_add_test(tst_qqmldebugprocess
     SOURCES
         ../../shared/qqmldebugprocess.cpp ../../shared/qqmldebugprocess_p.h
         tst_qqmldebugprocess.cpp
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
index f5b04b18b5..c6daa58d24 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebugprocessprocess Binary:
 #####################################################################
 
-qt_add_executable(qqmldebugprocessprocess
+qt_internal_add_executable(qqmldebugprocessprocess
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebugprocess"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess"
     SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
index 35e602d4f9..69d5498b6b 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebugprocessprocess Binary:
 #####################################################################
 
-qt_add_executable(qqmldebugprocessprocess
+qt_internal_add_executable(qqmldebugprocessprocess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess"
 # special case begin
 # Remove INSTALL_DIRECTORY which starts with
diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
index 93ad4c76a7..7434dc4286 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmldebugservice
+qt_internal_add_test(tst_qqmldebugservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -37,12 +37,12 @@ qt_add_test(tst_qqmldebugservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebugservice CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmldebugservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt
index 7264d7cbe5..e02ef7150c 100644
--- a/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qdebugtranslationservice
+qt_internal_add_test(tst_qdebugtranslationservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -34,12 +34,12 @@ qt_add_test(tst_qdebugtranslationservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qdebugtranslationservice CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qdebugtranslationservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qdebugtranslationservice CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qdebugtranslationservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
index a998af77cf..63eda146ea 100644
--- a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlenginecontrol
+qt_internal_add_test(tst_qqmlenginecontrol
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -33,12 +33,12 @@ qt_add_test(tst_qqmlenginecontrol
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
index f3fb518bfe..e2553e1abc 100644
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlenginedebuginspectorintegration
+qt_internal_add_test(tst_qqmlenginedebuginspectorintegration
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -30,12 +30,12 @@ qt_add_test(tst_qqmlenginedebuginspectorintegration
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
index fa7f15939e..4c3b449cb4 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlenginedebugservice Test:
 #####################################################################
 
-qt_add_test(tst_qqmlenginedebugservice
+qt_internal_add_test(tst_qqmlenginedebugservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -25,12 +25,12 @@ qt_add_test(tst_qqmlenginedebugservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
index 4ddb1d436d..3303c7d110 100644
--- a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlinspector
+qt_internal_add_test(tst_qqmlinspector
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -30,12 +30,12 @@ qt_add_test(tst_qqmlinspector
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlinspector CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlinspector CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
index bbff6a73c5..02ec4dcdea 100644
--- a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlnativeconnector Test:
 #####################################################################
 
-qt_add_test(tst_qqmlnativeconnector
+qt_internal_add_test(tst_qqmlnativeconnector
     SOURCES
         tst_qqmlnativeconnector.cpp
     DEFINES
diff --git a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
index 6a509748ba..38a3b9a00c 100644
--- a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND test_data "data/broken.qml")
 list(APPEND test_data "data/zoom.qml")
 list(APPEND test_data "data/i18n/qml_fr_FR.qm")
 
-qt_add_test(tst_qqmlpreview
+qt_internal_add_test(tst_qqmlpreview
     SOURCES
         ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h
         ../../../shared/util.cpp ../../../shared/util.h
@@ -34,12 +34,12 @@ qt_add_test(tst_qqmlpreview
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlpreview CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlpreview CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
index 2395c84e7d..394e4aa08d 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlprofilerservice
+qt_internal_add_test(tst_qqmlprofilerservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -32,12 +32,12 @@ qt_add_test(tst_qqmlprofilerservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
index 8d8aeb396b..f106208737 100644
--- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qv4debugger Test:
 #####################################################################
 
-qt_add_test(tst_qv4debugger
+qt_internal_add_test(tst_qv4debugger
     SOURCES
         ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h
         ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
diff --git a/tests/auto/qml/ecmascripttests/CMakeLists.txt b/tests/auto/qml/ecmascripttests/CMakeLists.txt
index 4b22007c7b..040e5d08c6 100644
--- a/tests/auto/qml/ecmascripttests/CMakeLists.txt
+++ b/tests/auto/qml/ecmascripttests/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_ecmascripttests Test:
 #####################################################################
 
-qt_add_test(tst_ecmascripttests
+qt_internal_add_test(tst_ecmascripttests
     SOURCES
         qjstest/test262runner.cpp qjstest/test262runner.h
         tst_ecmascripttests.cpp
diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
index 5c3581a7e9..4ffaf6c02f 100644
--- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
+++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qjstest)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Javascript test runner"
     SOURCES
         main.cpp
diff --git a/tests/auto/qml/parserstress/CMakeLists.txt b/tests/auto/qml/parserstress/CMakeLists.txt
index e18c6fd8fe..2d2f3df4c3 100644
--- a/tests/auto/qml/parserstress/CMakeLists.txt
+++ b/tests/auto/qml/parserstress/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     tests/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_parserstress
+qt_internal_add_test(tst_parserstress
     SOURCES
         tst_parserstress.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qjsengine/.prev_CMakeLists.txt b/tests/auto/qml/qjsengine/.prev_CMakeLists.txt
index aaff27ee03..8ea882795b 100644
--- a/tests/auto/qml/qjsengine/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qjsengine/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     script/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qjsengine
+qt_internal_add_test(tst_qjsengine
     SOURCES
         tst_qjsengine.cpp
     PUBLIC_LIBRARIES
@@ -30,7 +30,7 @@ set(qjsengine_resource_files
     "translations/translatable_la.qm"
 )
 
-qt_add_resource(tst_qjsengine "qjsengine"
+qt_internal_add_resource(tst_qjsengine "qjsengine"
     PREFIX
         "/"
     FILES
@@ -43,7 +43,7 @@ set(qmake_immediate_resource_files
     "testmodule.mjs"
 )
 
-qt_add_resource(tst_qjsengine "qmake_immediate"
+qt_internal_add_resource(tst_qjsengine "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt
index 3fc68ba163..83e13826bf 100644
--- a/tests/auto/qml/qjsengine/CMakeLists.txt
+++ b/tests/auto/qml/qjsengine/CMakeLists.txt
@@ -17,7 +17,7 @@ if(NOT TARGET Threads::Threads)
 endif()
 # special case end
 
-qt_add_test(tst_qjsengine
+qt_internal_add_test(tst_qjsengine
     SOURCES
         tst_qjsengine.cpp
     PUBLIC_LIBRARIES
@@ -39,7 +39,7 @@ set(qjsengine_resource_files
     "translations/translatable_la.qm"
 )
 
-qt_add_resource(tst_qjsengine "qjsengine"
+qt_internal_add_resource(tst_qjsengine "qjsengine"
     PREFIX
         "/"
     FILES
@@ -52,7 +52,7 @@ set(qmake_immediate_resource_files
     "testmodule.mjs"
 )
 
-qt_add_resource(tst_qjsengine "qmake_immediate"
+qt_internal_add_resource(tst_qjsengine "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qjsonbinding/CMakeLists.txt b/tests/auto/qml/qjsonbinding/CMakeLists.txt
index d4c3ef3dac..1704e4e790 100644
--- a/tests/auto/qml/qjsonbinding/CMakeLists.txt
+++ b/tests/auto/qml/qjsonbinding/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qjsonbinding
+qt_internal_add_test(tst_qjsonbinding
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qjsonbinding.cpp
@@ -26,12 +26,12 @@ qt_add_test(tst_qjsonbinding
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qjsonbinding CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qjsonbinding CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt b/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt
index 74789968d3..72bd0c6d8d 100644
--- a/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qjsvalue Test:
 #####################################################################
 
-qt_add_test(tst_qjsvalue
+qt_internal_add_test(tst_qjsvalue
     SOURCES
         tst_qjsvalue.cpp tst_qjsvalue.h
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qjsvalue/CMakeLists.txt b/tests/auto/qml/qjsvalue/CMakeLists.txt
index 06b43709d9..bb00f3221a 100644
--- a/tests/auto/qml/qjsvalue/CMakeLists.txt
+++ b/tests/auto/qml/qjsvalue/CMakeLists.txt
@@ -11,7 +11,7 @@ if(NOT TARGET Threads::Threads)
 endif()
 # special case end
 
-qt_add_test(tst_qjsvalue
+qt_internal_add_test(tst_qjsvalue
     SOURCES
         tst_qjsvalue.cpp tst_qjsvalue.h
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
index 48edd77265..5bf20d63c2 100644
--- a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
+++ b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qjsvalueiterator Test:
 #####################################################################
 
-qt_add_test(tst_qjsvalueiterator
+qt_internal_add_test(tst_qjsvalueiterator
     SOURCES
         tst_qjsvalueiterator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt
index 0571d2d3e1..06a5fb9b9c 100644
--- a/tests/auto/qml/qmlcachegen/CMakeLists.txt
+++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qmlcachegen
+qt_internal_add_test(tst_qmlcachegen
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmlcachegen.cpp
@@ -29,7 +29,7 @@ set(qmake_workerscripts_test_resource_files
     "data/worker.qml"
 )
 
-qt_add_resource(tst_qmlcachegen "qmake_workerscripts_test"
+qt_internal_add_resource(tst_qmlcachegen "qmake_workerscripts_test"
     PREFIX
         "/workerscripts"
     FILES
@@ -50,7 +50,7 @@ set(trickypaths_resource_files
     "data/versionStyleSuffix-1.2-more.qml"
 )
 
-qt_add_resource(tst_qmlcachegen "trickypaths"
+qt_internal_add_resource(tst_qmlcachegen "trickypaths"
     PREFIX
         "/directory with spaces"
     FILES
@@ -63,7 +63,7 @@ set(retain_resource_files
     "Retain.qml"
 )
 
-qt_add_resource(tst_qmlcachegen "retain"
+qt_internal_add_resource(tst_qmlcachegen "retain"
     PREFIX
         "/"
     BASE
@@ -79,7 +79,7 @@ set(skip_resource_files
     "SkipQmlCacheGen.qml"
 )
 
-qt_add_resource(tst_qmlcachegen "skip"
+qt_internal_add_resource(tst_qmlcachegen "skip"
     PREFIX
         "/not/"
     BASE
@@ -101,7 +101,7 @@ set(qmake_immediate_resource_files
     "data/versionchecks.qml"
 )
 
-qt_add_resource(tst_qmlcachegen "qmake_immediate"
+qt_internal_add_resource(tst_qmlcachegen "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -121,7 +121,7 @@ if(UNIX)
         "data/umlaut.qml"
     )
 
-    qt_add_resource(tst_qmlcachegen "trickypaths_umlaut"
+    qt_internal_add_resource(tst_qmlcachegen "trickypaths_umlaut"
         PREFIX
             "/"
         FILES
@@ -129,12 +129,12 @@ if(UNIX)
     )
 endif()
 
-qt_extend_target(tst_qmlcachegen CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qmlcachegen CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
index 86bcca1bba..6fbc6bf058 100644
--- a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmldiskcache Test:
 #####################################################################
 
-qt_add_test(tst_qmldiskcache
+qt_internal_add_test(tst_qmldiskcache
     SOURCES
         tst_qmldiskcache.cpp
     PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ set(qmake_immediate_resource_files
     "test.qml"
 )
 
-qt_add_resource(tst_qmldiskcache "qmake_immediate"
+qt_internal_add_resource(tst_qmldiskcache "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qmldiskcache/CMakeLists.txt b/tests/auto/qml/qmldiskcache/CMakeLists.txt
index b4ff957331..c45f7d6d5c 100644
--- a/tests/auto/qml/qmldiskcache/CMakeLists.txt
+++ b/tests/auto/qml/qmldiskcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmldiskcache Test:
 #####################################################################
 
-qt_add_test(tst_qmldiskcache
+qt_internal_add_test(tst_qmldiskcache
     SOURCES
         tst_qmldiskcache.cpp
     PUBLIC_LIBRARIES
@@ -31,7 +31,7 @@ set(qmake_immediate_resource_files
     "test.qml"
 )
 
-qt_add_resource(tst_qmldiskcache "qmake_immediate"
+qt_internal_add_resource(tst_qmldiskcache "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qmlformat/CMakeLists.txt b/tests/auto/qml/qmlformat/CMakeLists.txt
index 14a8acb5d9..01f4fa2837 100644
--- a/tests/auto/qml/qmlformat/CMakeLists.txt
+++ b/tests/auto/qml/qmlformat/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qmlformat
+qt_internal_add_test(tst_qmlformat
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmlformat.cpp
@@ -26,12 +26,12 @@ qt_add_test(tst_qmlformat
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmlformat CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qmlformat CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qmlformat CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qmlformat CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmlimportscanner/CMakeLists.txt b/tests/auto/qml/qmlimportscanner/CMakeLists.txt
index 58c6620ff0..66231beccb 100644
--- a/tests/auto/qml/qmlimportscanner/CMakeLists.txt
+++ b/tests/auto/qml/qmlimportscanner/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qmlimportscanner
+qt_internal_add_test(tst_qmlimportscanner
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmlimportscanner.cpp
@@ -24,12 +24,12 @@ qt_add_test(tst_qmlimportscanner
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmlimportscanner CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qmlimportscanner CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qmlimportscanner CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qmlimportscanner CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmllint/CMakeLists.txt b/tests/auto/qml/qmllint/CMakeLists.txt
index a66507f625..2518740101 100644
--- a/tests/auto/qml/qmllint/CMakeLists.txt
+++ b/tests/auto/qml/qmllint/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qmllint
+qt_internal_add_test(tst_qmllint
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmllint.cpp
@@ -24,12 +24,12 @@ qt_add_test(tst_qmllint
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmllint CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qmllint CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmlplugindump/CMakeLists.txt b/tests/auto/qml/qmlplugindump/CMakeLists.txt
index 9ef606bae0..1bf13a2c02 100644
--- a/tests/auto/qml/qmlplugindump/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmlplugindump Test:
 #####################################################################
 
-qt_add_test(tst_qmlplugindump
+qt_internal_add_test(tst_qmlplugindump
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmlplugindump.cpp
@@ -20,12 +20,12 @@ qt_add_test(tst_qmlplugindump
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmlplugindump CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qmlplugindump CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qmlplugindump CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qmlplugindump CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
index e8f6a9f7b7..c2881170b0 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Dummy Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Dummy
+qt_internal_add_cmake_library(Dummy
     MODULE
     SOURCES
         dummy.cpp dummy.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
index 933b3f152e..5cb08a8570 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Dummy Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Dummy
+qt_internal_add_cmake_library(Dummy
     MODULE
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
index 993c3e19e6..3030d4b428 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## ExtendedType Generic Library:
 #####################################################################
 
-qt_add_cmake_library(ExtendedType
+qt_internal_add_cmake_library(ExtendedType
     MODULE
     SOURCES
         plugin.cpp plugin.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
index 9e934eff60..fae7a5f990 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## ExtendedType Generic Library:
 #####################################################################
 
-qt_add_cmake_library(ExtendedType
+qt_internal_add_cmake_library(ExtendedType
     MODULE
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
index ae80ac867a..dbec5d422e 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Imports Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Imports
+qt_internal_add_cmake_library(Imports
     MODULE
     SOURCES
         imports.cpp imports.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
index cf9871b42e..6b1dcdaf7c 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Imports Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Imports
+qt_internal_add_cmake_library(Imports
     MODULE
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
index 2edf46a96a..13f18fc789 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Versions Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Versions
+qt_internal_add_cmake_library(Versions
     MODULE
     SOURCES
         versions.cpp versions.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
index 950ffda821..3f499afa71 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Versions Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Versions
+qt_internal_add_cmake_library(Versions
     MODULE
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt
index 65272b0c7f..9ee509cebb 100644
--- a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmltyperegistrar Test:
 #####################################################################
 
-qt_add_test(tst_qmltyperegistrar
+qt_internal_add_test(tst_qmltyperegistrar
     SOURCES
         hppheader.hpp
         noextheader
diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
index 4af6313c65..d581589f4d 100644
--- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
+++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_manual_moc(moc_files OUTPUT_MOC_JSON_FILES json_list noextheader) # special case
-qt_add_test(tst_qmltyperegistrar
+qt_internal_add_test(tst_qmltyperegistrar
     SOURCES
         hppheader.hpp
         # noextheader special case
diff --git a/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt
index 4933b9271e..0dcbd16e43 100644
--- a/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmltyperegistrar/foreign/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## foreign Generic Library:
 #####################################################################
 
-qt_add_cmake_library(foreign
+qt_internal_add_cmake_library(foreign
     STATIC
     SOURCES
         foreign.cpp foreign.h
diff --git a/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt
index cc85c404c5..dc969c2468 100644
--- a/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt
+++ b/tests/auto/qml/qmltyperegistrar/foreign/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## foreign Generic Library:
 #####################################################################
 
-qt_add_cmake_library(foreign
+qt_internal_add_cmake_library(foreign
     STATIC
     SOURCES
         foreign.cpp foreign.h
diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
index 695651f90e..ea88b6c8e3 100644
--- a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlapplicationengine
+qt_internal_add_test(tst_qqmlapplicationengine
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlapplicationengine.cpp
@@ -30,7 +30,7 @@ set(tst_qqmlapplicationengine_resource_files
     "data/loadTranslation.qml"
 )
 
-qt_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine"
+qt_internal_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine"
     PREFIX
         "/"
     FILES
@@ -44,12 +44,12 @@ qt_add_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
index b97251f0b8..f1b2b43506 100644
--- a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
+++ b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testapp Binary:
 #####################################################################
 
-qt_add_executable(testapp
+qt_internal_add_executable(testapp
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
@@ -21,7 +21,7 @@ set(main_resource_files
     "immediateQuit.qml"
 )
 
-qt_add_resource(testapp "main"
+qt_internal_add_resource(testapp "main"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qqmlbinding/CMakeLists.txt b/tests/auto/qml/qqmlbinding/CMakeLists.txt
index f885560bbe..c95d3e6f29 100644
--- a/tests/auto/qml/qqmlbinding/CMakeLists.txt
+++ b/tests/auto/qml/qqmlbinding/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlbinding
+qt_internal_add_test(tst_qqmlbinding
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlbinding.cpp
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmlbinding
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlbinding CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlbinding CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlchangeset/CMakeLists.txt b/tests/auto/qml/qqmlchangeset/CMakeLists.txt
index fafffa2a68..da06b85fad 100644
--- a/tests/auto/qml/qqmlchangeset/CMakeLists.txt
+++ b/tests/auto/qml/qqmlchangeset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlhangeset Test:
 #####################################################################
 
-qt_add_test(tst_qqmlhangeset
+qt_internal_add_test(tst_qqmlhangeset
     SOURCES
         tst_qqmlchangeset.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt
index e773e58cd2..c7dd50e8d6 100644
--- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlcomponent
+qt_internal_add_test(tst_qqmlcomponent
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -32,7 +32,7 @@ set(qmake_immediate_resource_files
     "data/QtObjectComponent.qml"
 )
 
-qt_add_resource(tst_qqmlcomponent "qmake_immediate"
+qt_internal_add_resource(tst_qqmlcomponent "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -43,12 +43,12 @@ qt_add_resource(tst_qqmlcomponent "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlcomponent CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlcomponent CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlconnections/CMakeLists.txt b/tests/auto/qml/qqmlconnections/CMakeLists.txt
index 8f6b9ce87f..fef16f58f8 100644
--- a/tests/auto/qml/qqmlconnections/CMakeLists.txt
+++ b/tests/auto/qml/qqmlconnections/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlconnections
+qt_internal_add_test(tst_qqmlconnections
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlconnections.cpp
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmlconnections
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlconnections CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlconnections CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlconsole/CMakeLists.txt b/tests/auto/qml/qqmlconsole/CMakeLists.txt
index f22fcbc4da..5e98ed2f31 100644
--- a/tests/auto/qml/qqmlconsole/CMakeLists.txt
+++ b/tests/auto/qml/qqmlconsole/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlconsole
+qt_internal_add_test(tst_qqmlconsole
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlconsole.cpp
@@ -26,12 +26,12 @@ qt_add_test(tst_qqmlconsole
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlconsole CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlconsole CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlcontext/CMakeLists.txt b/tests/auto/qml/qqmlcontext/CMakeLists.txt
index 08982b837b..ce07e8c785 100644
--- a/tests/auto/qml/qqmlcontext/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcontext/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlcontext
+qt_internal_add_test(tst_qqmlcontext
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlcontext.cpp
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlcontext
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlcontext CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlcontext CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlcpputils/CMakeLists.txt b/tests/auto/qml/qqmlcpputils/CMakeLists.txt
index ad6febe94f..c508a1f7e7 100644
--- a/tests/auto/qml/qqmlcpputils/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcpputils/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlcpputils Test:
 #####################################################################
 
-qt_add_test(tst_qqmlcpputils
+qt_internal_add_test(tst_qqmlcpputils
     SOURCES
         tst_qqmlcpputils.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt b/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
index f29187d29e..ef31fa3db3 100644
--- a/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmldelegatemodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmldelegatemodel
+qt_internal_add_test(tst_qqmldelegatemodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmldelegatemodel.cpp
@@ -31,12 +31,12 @@ qt_add_test(tst_qqmldelegatemodel
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldelegatemodel CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmldelegatemodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldelegatemodel CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmldelegatemodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmldirparser/CMakeLists.txt b/tests/auto/qml/qqmldirparser/CMakeLists.txt
index 36f010d682..255cc75c6a 100644
--- a/tests/auto/qml/qqmldirparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmldirparser/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmldirparser
+qt_internal_add_test(tst_qqmldirparser
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmldirparser.cpp
@@ -26,12 +26,12 @@ qt_add_test(tst_qqmldirparser
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldirparser CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmldirparser CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
index a30688cfaa..26b7f2437d 100644
--- a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlecmascript
+qt_internal_add_test(tst_qqmlecmascript
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -35,7 +35,7 @@ set(qqmlecmascript_resource_files
     "data/js/include3.js"
 )
 
-qt_add_resource(tst_qqmlecmascript "qqmlecmascript"
+qt_internal_add_resource(tst_qqmlecmascript "qqmlecmascript"
     PREFIX
         "/"
     FILES
@@ -46,17 +46,17 @@ qt_add_resource(tst_qqmlecmascript "qqmlecmascript"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlecmascript/CMakeLists.txt b/tests/auto/qml/qqmlecmascript/CMakeLists.txt
index bf74b8ccba..5c5bd528ed 100644
--- a/tests/auto/qml/qqmlecmascript/CMakeLists.txt
+++ b/tests/auto/qml/qqmlecmascript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlecmascript
+qt_internal_add_test(tst_qqmlecmascript
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -42,7 +42,7 @@ set_source_files_properties(
         QT_SKIP_QUICKCOMPILER 1)
 # special case end
 
-qt_add_resource(tst_qqmlecmascript "qqmlecmascript"
+qt_internal_add_resource(tst_qqmlecmascript "qqmlecmascript"
     PREFIX
         "/"
     FILES
@@ -53,17 +53,17 @@ qt_add_resource(tst_qqmlecmascript "qqmlecmascript"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlengine/CMakeLists.txt b/tests/auto/qml/qqmlengine/CMakeLists.txt
index f692a1a3a5..88037fb009 100644
--- a/tests/auto/qml/qqmlengine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlengine/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlengine
+qt_internal_add_test(tst_qqmlengine
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlengine.cpp
@@ -31,7 +31,7 @@ set(qmake_immediate_resource_files
     "data/qrcurls.qml"
 )
 
-qt_add_resource(tst_qqmlengine "qmake_immediate"
+qt_internal_add_resource(tst_qqmlengine "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -42,17 +42,17 @@ qt_add_resource(tst_qqmlengine "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlengine CONDITION boot2qt
+qt_internal_extend_target(tst_qqmlengine CONDITION boot2qt
     DEFINES
         SKIP_GCCORRUPTION_TEST
 )
 
-qt_extend_target(tst_qqmlengine CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlengine CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
index 62647409c1..f8637755b7 100644
--- a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlenginecleanup Test:
 #####################################################################
 
-qt_add_test(tst_qqmlenginecleanup
+qt_internal_add_test(tst_qqmlenginecleanup
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlenginecleanup.cpp
@@ -18,12 +18,12 @@ qt_add_test(tst_qqmlenginecleanup
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
index f16ce3e6c3..b68b65aac4 100644
--- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## CustomModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(CustomModule
+qt_internal_add_cmake_library(CustomModule
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule"
     SOURCES
         moduleplugin.cpp
@@ -20,7 +20,7 @@ set(moduleplugin_resource_files
     "ModuleType.qml"
 )
 
-qt_add_resource(CustomModule "moduleplugin"
+qt_internal_add_resource(CustomModule "moduleplugin"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
index f98f97cf81..e53d8307e4 100644
--- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## CustomModule Generic Library:
 #####################################################################
 
-qt_add_cmake_library(CustomModule
+qt_internal_add_cmake_library(CustomModule
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule"
     SOURCES
         moduleplugin.cpp
@@ -20,7 +20,7 @@ set(moduleplugin_resource_files
     "ModuleType.qml"
 )
 
-qt_add_resource(CustomModule "moduleplugin"
+qt_internal_add_resource(CustomModule "moduleplugin"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qqmlerror/CMakeLists.txt b/tests/auto/qml/qqmlerror/CMakeLists.txt
index c4d218fb8e..7bb8715b01 100644
--- a/tests/auto/qml/qqmlerror/CMakeLists.txt
+++ b/tests/auto/qml/qqmlerror/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlerror
+qt_internal_add_test(tst_qqmlerror
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlerror.cpp
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlerror
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlerror CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlerror CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlexpression/CMakeLists.txt b/tests/auto/qml/qqmlexpression/CMakeLists.txt
index 55f85089bf..cc5e69d4bc 100644
--- a/tests/auto/qml/qqmlexpression/CMakeLists.txt
+++ b/tests/auto/qml/qqmlexpression/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlexpression
+qt_internal_add_test(tst_qqmlexpression
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlexpression.cpp
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlexpression
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlexpression CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlexpression CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
index d0716ed8ff..16d884f66b 100644
--- a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlextensionplugin Test:
 #####################################################################
 
-qt_add_test(tst_qqmlextensionplugin
+qt_internal_add_test(tst_qqmlextensionplugin
     SOURCES
         tst_qqmlextensionplugin.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlfile/CMakeLists.txt b/tests/auto/qml/qqmlfile/CMakeLists.txt
index 2a0fa63bb8..3de9d5884c 100644
--- a/tests/auto/qml/qqmlfile/CMakeLists.txt
+++ b/tests/auto/qml/qqmlfile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlfile Test:
 #####################################################################
 
-qt_add_test(tst_qqmlfile
+qt_internal_add_test(tst_qqmlfile
     SOURCES
         tst_qqmlfile.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlfileselector/CMakeLists.txt b/tests/auto/qml/qqmlfileselector/CMakeLists.txt
index 34e80921cb..61707f79c7 100644
--- a/tests/auto/qml/qqmlfileselector/CMakeLists.txt
+++ b/tests/auto/qml/qqmlfileselector/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlfileselector
+qt_internal_add_test(tst_qqmlfileselector
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlfileselector.cpp
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlfileselector
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlfileselector CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlfileselector CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlglobal/CMakeLists.txt b/tests/auto/qml/qqmlglobal/CMakeLists.txt
index 50ced86ee4..ef7884993e 100644
--- a/tests/auto/qml/qqmlglobal/CMakeLists.txt
+++ b/tests/auto/qml/qqmlglobal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlglobal Test:
 #####################################################################
 
-qt_add_test(tst_qqmlglobal
+qt_internal_add_test(tst_qqmlglobal
     SOURCES
         tst_qqmlglobal.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlimport/CMakeLists.txt b/tests/auto/qml/qqmlimport/CMakeLists.txt
index 175543232f..dba34c1a0b 100644
--- a/tests/auto/qml/qqmlimport/CMakeLists.txt
+++ b/tests/auto/qml/qqmlimport/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
     FormFromQmlDir/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlimport
+qt_internal_add_test(tst_qqmlimport
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlimport.cpp
@@ -39,12 +39,12 @@ qt_add_test(tst_qqmlimport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlimport CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlimport CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlincubator/CMakeLists.txt b/tests/auto/qml/qqmlincubator/CMakeLists.txt
index 36879eee87..34f794b7d9 100644
--- a/tests/auto/qml/qqmlincubator/CMakeLists.txt
+++ b/tests/auto/qml/qqmlincubator/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlincubator
+qt_internal_add_test(tst_qqmlincubator
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         testtypes.cpp testtypes.h
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlincubator
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlincubator CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlincubator CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlinfo/CMakeLists.txt b/tests/auto/qml/qqmlinfo/CMakeLists.txt
index 821228245b..4d234e8ce0 100644
--- a/tests/auto/qml/qqmlinfo/CMakeLists.txt
+++ b/tests/auto/qml/qqmlinfo/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlinfo
+qt_internal_add_test(tst_qqmlinfo
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         attached.cpp attached.h
@@ -32,12 +32,12 @@ qt_add_test(tst_qqmlinfo
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlinfo CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlinfo CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
index 36c496cbf3..b7d967ca9f 100644
--- a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
+++ b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlinstantiator
+qt_internal_add_test(tst_qqmlinstantiator
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         stringmodel.h
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlinstantiator
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlinstantiator CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlinstantiator CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
index e531ac95c4..5246638739 100644
--- a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
+++ b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlitemmodels
+qt_internal_add_test(tst_qqmlitemmodels
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         qtestmodel.h
@@ -30,12 +30,12 @@ qt_add_test(tst_qqmlitemmodels
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlitemmodels CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlitemmodels CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt
index d428621600..e7fa05d23e 100644
--- a/tests/auto/qml/qqmllanguage/CMakeLists.txt
+++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmllanguage
+qt_internal_add_test(tst_qqmllanguage
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -44,7 +44,7 @@ if(ANDROID)
         "data/I18nType30.qml"
     )
 
-    qt_add_resource(tst_qqmllanguage "qqmllanguage"
+    qt_internal_add_resource(tst_qqmllanguage "qqmllanguage"
         PREFIX
             "/"
         FILES
@@ -52,12 +52,12 @@ if(ANDROID)
     )
 endif()
 
-qt_extend_target(tst_qqmllanguage CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmllanguage CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
index 940a41f5cd..2780075f09 100644
--- a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmllistcompositor Test:
 #####################################################################
 
-qt_add_test(tst_qqmllistcompositor
+qt_internal_add_test(tst_qqmllistcompositor
     SOURCES
         tst_qqmllistcompositor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmllistmodel/CMakeLists.txt b/tests/auto/qml/qqmllistmodel/CMakeLists.txt
index b83e2b3cf1..d583dc3b0e 100644
--- a/tests/auto/qml/qqmllistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistmodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmllistmodel
+qt_internal_add_test(tst_qqmllistmodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmllistmodel.cpp
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmllistmodel
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmllistmodel CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmllistmodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
index 436f38a13b..66c7c3a557 100644
--- a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmllistmodelworkerscript
+qt_internal_add_test(tst_qqmllistmodelworkerscript
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmllistmodelworkerscript.cpp
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmllistmodelworkerscript
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistreference/CMakeLists.txt b/tests/auto/qml/qqmllistreference/CMakeLists.txt
index cb2d91826c..15fa87b0b7 100644
--- a/tests/auto/qml/qqmllistreference/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistreference/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmllistreference
+qt_internal_add_test(tst_qqmllistreference
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmllistreference.cpp
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmllistreference
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmllistreference CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmllistreference CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllocale/CMakeLists.txt b/tests/auto/qml/qqmllocale/CMakeLists.txt
index 408f4a5c19..4022cb8cc4 100644
--- a/tests/auto/qml/qqmllocale/CMakeLists.txt
+++ b/tests/auto/qml/qqmllocale/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmllocale
+qt_internal_add_test(tst_qqmllocale
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmllocale.cpp
@@ -26,12 +26,12 @@ qt_add_test(tst_qqmllocale
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmllocale CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmllocale CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
index 20e8fff759..c7ec398a5d 100644
--- a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlmetaobject
+qt_internal_add_test(tst_qqmlmetaobject
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlmetaobject.cpp
@@ -26,12 +26,12 @@ qt_add_test(tst_qqmlmetaobject
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlmetaobject CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlmetaobject CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
index 66f2a6586e..55eebaa651 100644
--- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlmetatype
+qt_internal_add_test(tst_qqmlmetatype
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlmetatype.cpp
@@ -29,7 +29,7 @@ set(qmake_qmlfiles_resource_files
     "data/CompositeType.qml"
 )
 
-qt_add_resource(tst_qqmlmetatype "qmake_qmlfiles"
+qt_internal_add_resource(tst_qqmlmetatype "qmake_qmlfiles"
     PREFIX
         "/tstqqmlmetatype"
     FILES
@@ -41,7 +41,7 @@ set(qmake_qmldirresource_resource_files
     "data/enumsInRecursiveImport.qml"
 )
 
-qt_add_resource(tst_qqmlmetatype "qmake_qmldirresource"
+qt_internal_add_resource(tst_qqmlmetatype "qmake_qmldirresource"
     PREFIX
         "/"
     FILES
@@ -52,12 +52,12 @@ qt_add_resource(tst_qqmlmetatype "qmake_qmldirresource"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlmetatype CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlmetatype CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
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
diff --git a/tests/auto/qml/qqmlnotifier/CMakeLists.txt b/tests/auto/qml/qqmlnotifier/CMakeLists.txt
index 75c4893e26..5cc0495393 100644
--- a/tests/auto/qml/qqmlnotifier/CMakeLists.txt
+++ b/tests/auto/qml/qqmlnotifier/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlnotifier
+qt_internal_add_test(tst_qqmlnotifier
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlnotifier.cpp
@@ -25,12 +25,12 @@ qt_add_test(tst_qqmlnotifier
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlnotifier CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlnotifier CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
index 347a68a8de..b16bd99b2b 100644
--- a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlobjectmodel Test:
 #####################################################################
 
-qt_add_test(tst_qqmlobjectmodel
+qt_internal_add_test(tst_qqmlobjectmodel
     SOURCES
         tst_qqmlobjectmodel.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
index 361ea61ae9..3e223a21fd 100644
--- a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
+++ b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlopenmetaobject Test:
 #####################################################################
 
-qt_add_test(tst_qqmlopenmetaobject
+qt_internal_add_test(tst_qqmlopenmetaobject
     SOURCES
         tst_qqmlopenmetaobject.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt
index 6fc6135e5f..c322e29e94 100644
--- a/tests/auto/qml/qqmlparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmlparser/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlparser
+qt_internal_add_test(tst_qqmlparser
     SOURCES
         ../../shared/qqmljsastdumper.cpp ../../shared/qqmljsastdumper.h
         ../../shared/util.cpp ../../shared/util.h
@@ -28,17 +28,17 @@ qt_add_test(tst_qqmlparser
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlparser CONDITION CMAKE_CROSSCOMPILING
+qt_internal_extend_target(tst_qqmlparser CONDITION CMAKE_CROSSCOMPILING
     DEFINES
         QTEST_CROSS_COMPILED
 )
 
-qt_extend_target(tst_qqmlparser CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlparser CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpromise/CMakeLists.txt b/tests/auto/qml/qqmlpromise/CMakeLists.txt
index 591ad850db..e972ab08fb 100644
--- a/tests/auto/qml/qqmlpromise/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpromise/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlpromise
+qt_internal_add_test(tst_qqmlpromise
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlpromise.cpp
@@ -33,12 +33,12 @@ qt_add_test(tst_qqmlpromise
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlpromise CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlpromise CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt
index 8e28a0bfd2..2dabf0f948 100644
--- a/tests/auto/qml/qqmlproperty/CMakeLists.txt
+++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlproperty
+qt_internal_add_test(tst_qqmlproperty
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         interfaces.h
@@ -32,12 +32,12 @@ qt_add_test(tst_qqmlproperty
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlproperty CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlproperty CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
index 7c84ef687a..55f8c7b76b 100644
--- a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlpropertycache
+qt_internal_add_test(tst_qqmlpropertycache
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlpropertycache.cpp
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlpropertycache
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlpropertycache CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlpropertycache CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
index 7d5bce3056..3092aa4eb2 100644
--- a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlpropertymap
+qt_internal_add_test(tst_qqmlpropertymap
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlpropertymap.cpp
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmlpropertymap
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlpropertymap CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlpropertymap CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlqt/CMakeLists.txt b/tests/auto/qml/qqmlqt/CMakeLists.txt
index 085c7e0f75..1c965d5c5a 100644
--- a/tests/auto/qml/qqmlqt/CMakeLists.txt
+++ b/tests/auto/qml/qqmlqt/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlqt
+qt_internal_add_test(tst_qqmlqt
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlqt.cpp
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmlqt
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlqt CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlqt CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlsettings/CMakeLists.txt b/tests/auto/qml/qqmlsettings/CMakeLists.txt
index 40bc827555..01d35824da 100644
--- a/tests/auto/qml/qqmlsettings/CMakeLists.txt
+++ b/tests/auto/qml/qqmlsettings/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlsettings
+qt_internal_add_test(tst_qqmlsettings
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlsettings.cpp
@@ -25,12 +25,12 @@ qt_add_test(tst_qqmlsettings
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlsettings CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlsettings CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
index bc4a88653b..b9762b2eb6 100644
--- a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
+++ b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlsqldatabase
+qt_internal_add_test(tst_qqmlsqldatabase
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlsqldatabase.cpp
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlsqldatabase
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltablemodel/CMakeLists.txt b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
index ee33bb4517..75da1fc93f 100644
--- a/tests/auto/qml/qqmltablemodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmltablemodel
+qt_internal_add_test(tst_qqmltablemodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmltablemodel.cpp
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmltablemodel
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmltablemodel CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmltablemodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltimer/CMakeLists.txt b/tests/auto/qml/qqmltimer/CMakeLists.txt
index aeb299c914..0f80a2dc79 100644
--- a/tests/auto/qml/qqmltimer/CMakeLists.txt
+++ b/tests/auto/qml/qqmltimer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmltimer Test:
 #####################################################################
 
-qt_add_test(tst_qqmltimer
+qt_internal_add_test(tst_qqmltimer
     SOURCES
         tst_qqmltimer.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
index 576f836cf9..73b327f814 100644
--- a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmltranslation
+qt_internal_add_test(tst_qqmltranslation
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmltranslation.cpp
@@ -31,7 +31,7 @@ set(translation_resource_files
     "translation.qml"
 )
 
-qt_add_resource(tst_qqmltranslation "translation"
+qt_internal_add_resource(tst_qqmltranslation "translation"
     PREFIX
         "/"
     BASE
@@ -44,12 +44,12 @@ qt_add_resource(tst_qqmltranslation "translation"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt
index 8b665dd1b5..6e67a2ecfb 100644
--- a/tests/auto/qml/qqmltranslation/CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmltranslation
+qt_internal_add_test(tst_qqmltranslation
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmltranslation.cpp
@@ -45,7 +45,7 @@ set_source_files_properties(
 )
 # special case end
 
-qt_add_resource(tst_qqmltranslation "translation"
+qt_internal_add_resource(tst_qqmltranslation "translation"
     PREFIX
         "/"
     BASE
@@ -58,12 +58,12 @@ qt_add_resource(tst_qqmltranslation "translation"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
index a28d7592e3..13a7e49b17 100644
--- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmltypeloader
+qt_internal_add_test(tst_qqmltypeloader
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -32,12 +32,12 @@ qt_add_test(tst_qqmltypeloader
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmltypeloader CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmltypeloader CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
index 7dd4bb659c..7e6324636b 100644
--- a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Slow Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Slow
+qt_internal_add_cmake_library(Slow
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow"
     SOURCES
         plugin.cpp plugin.h
diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
index c377016682..18043652cd 100644
--- a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Slow Generic Library:
 #####################################################################
 
-qt_add_cmake_library(Slow
+qt_internal_add_cmake_library(Slow
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow"
     SOURCES
         plugin.cpp plugin.h
diff --git a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
index 6af68cb1ce..697f501153 100644
--- a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
+++ b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlvaluetypeproviders
+qt_internal_add_test(tst_qqmlvaluetypeproviders
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         testtypes.cpp testtypes.h
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlvaluetypeproviders
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
index 0fc8045f38..fc76a3ff12 100644
--- a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
+++ b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlvaluetypes
+qt_internal_add_test(tst_qqmlvaluetypes
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         testtypes.cpp testtypes.h
@@ -32,12 +32,12 @@ qt_add_test(tst_qqmlvaluetypes
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
index 233a3aac62..4f428fe3a1 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
+++ b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qqmlxmlhttprequest
+qt_internal_add_test(tst_qqmlxmlhttprequest
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlxmlhttprequest
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
index b222e3db6d..313787cb31 100644
--- a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qquickfolderlistmodel
+qt_internal_add_test(tst_qquickfolderlistmodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickfolderlistmodel.cpp
@@ -29,7 +29,7 @@ set(introspect_resource_files
     "txtdir/hello.txt"
 )
 
-qt_add_resource(tst_qquickfolderlistmodel "introspect"
+qt_internal_add_resource(tst_qquickfolderlistmodel "introspect"
     PREFIX
         "/myprefix/subdir"
     BASE
@@ -42,12 +42,12 @@ qt_add_resource(tst_qquickfolderlistmodel "introspect"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
index 326f8245e9..9c44abd939 100644
--- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qquickfolderlistmodel
+qt_internal_add_test(tst_qquickfolderlistmodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickfolderlistmodel.cpp
@@ -32,7 +32,7 @@ set(introspect_resource_files
     "txtdir/hello.txt"
 )
 
-qt_add_resource(tst_qquickfolderlistmodel "introspect"
+qt_internal_add_resource(tst_qquickfolderlistmodel "introspect"
     PREFIX
         "/myprefix/subdir"
     BASE
@@ -45,12 +45,12 @@ qt_add_resource(tst_qquickfolderlistmodel "introspect"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickworkerscript/CMakeLists.txt b/tests/auto/qml/qquickworkerscript/CMakeLists.txt
index de9e45d662..52a2380ff4 100644
--- a/tests/auto/qml/qquickworkerscript/CMakeLists.txt
+++ b/tests/auto/qml/qquickworkerscript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qquickworkerscript
+qt_internal_add_test(tst_qquickworkerscript
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickworkerscript.cpp
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickworkerscript
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickworkerscript CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qquickworkerscript CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qrcqml/CMakeLists.txt b/tests/auto/qml/qrcqml/CMakeLists.txt
index 88e910ba05..52624e38d3 100644
--- a/tests/auto/qml/qrcqml/CMakeLists.txt
+++ b/tests/auto/qml/qrcqml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrcqml Test:
 #####################################################################
 
-qt_add_test(tst_qrcqml
+qt_internal_add_test(tst_qrcqml
     SOURCES
         tst_qrcqml.cpp
     PUBLIC_LIBRARIES
@@ -31,7 +31,7 @@ set(qrcqml_resource_files
     "data/main2.qml"
 )
 
-qt_add_resource(tst_qrcqml "qrcqml"
+qt_internal_add_resource(tst_qrcqml "qrcqml"
     PREFIX
         "/"
     FILES
@@ -48,7 +48,7 @@ set(qrcqml1_resource_files
     "data/main3.qml"
 )
 
-qt_add_resource(tst_qrcqml "qrcqml1"
+qt_internal_add_resource(tst_qrcqml "qrcqml1"
     PREFIX
         "/search"
     FILES
@@ -61,7 +61,7 @@ set(qrcqml2_resource_files
     "data/SubDir.qml"
 )
 
-qt_add_resource(tst_qrcqml "qrcqml2"
+qt_internal_add_resource(tst_qrcqml "qrcqml2"
     PREFIX
         "/search/data"
     FILES
@@ -78,7 +78,7 @@ set(qrcqml3_resource_files
     "data/imports/QrcImport/qmldir"
 )
 
-qt_add_resource(tst_qrcqml "qrcqml3"
+qt_internal_add_resource(tst_qrcqml "qrcqml3"
     PREFIX
         "/imports"
     FILES
diff --git a/tests/auto/qml/qtqmlmodules/CMakeLists.txt b/tests/auto/qml/qtqmlmodules/CMakeLists.txt
index b42cb964b8..9637588a8b 100644
--- a/tests/auto/qml/qtqmlmodules/CMakeLists.txt
+++ b/tests/auto/qml/qtqmlmodules/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qtqmlmodules
+qt_internal_add_test(tst_qtqmlmodules
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qtqmlmodules.cpp
@@ -27,12 +27,12 @@ qt_add_test(tst_qtqmlmodules
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtqmlmodules CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qtqmlmodules CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qv4assembler/CMakeLists.txt b/tests/auto/qml/qv4assembler/CMakeLists.txt
index b54dd67816..1f73fd3495 100644
--- a/tests/auto/qml/qv4assembler/CMakeLists.txt
+++ b/tests/auto/qml/qv4assembler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qv4assembler
+qt_internal_add_test(tst_qv4assembler
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qv4assembler.cpp
@@ -25,12 +25,12 @@ qt_add_test(tst_qv4assembler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qv4assembler CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qv4assembler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qv4identifiertable/CMakeLists.txt b/tests/auto/qml/qv4identifiertable/CMakeLists.txt
index 8606bb0d3a..0a21c81ef1 100644
--- a/tests/auto/qml/qv4identifiertable/CMakeLists.txt
+++ b/tests/auto/qml/qv4identifiertable/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qv4identifiertable Test:
 #####################################################################
 
-qt_add_test(tst_qv4identifiertable
+qt_internal_add_test(tst_qv4identifiertable
     SOURCES
         tst_qv4identifiertable.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qv4mm/CMakeLists.txt b/tests/auto/qml/qv4mm/CMakeLists.txt
index b319f36792..f5667c2b5d 100644
--- a/tests/auto/qml/qv4mm/CMakeLists.txt
+++ b/tests/auto/qml/qv4mm/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_qv4mm
+qt_internal_add_test(tst_qv4mm
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qv4mm.cpp
@@ -26,12 +26,12 @@ qt_add_test(tst_qv4mm
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qv4mm CONDITION ANDROID OR IOS
+qt_internal_extend_target(tst_qv4mm CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT IOS
+qt_internal_extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qv4regexp/CMakeLists.txt b/tests/auto/qml/qv4regexp/CMakeLists.txt
index bba8314256..709ea7aa7f 100644
--- a/tests/auto/qml/qv4regexp/CMakeLists.txt
+++ b/tests/auto/qml/qv4regexp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qv4regexp Test:
 #####################################################################
 
-qt_add_test(tst_qv4regexp
+qt_internal_add_test(tst_qv4regexp
     SOURCES
         tst_qv4regexp.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
index 2596f05930..56e0181e89 100644
--- a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
+++ b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwidgetsinqml Test:
 #####################################################################
 
-qt_add_test(tst_qwidgetsinqml
+qt_internal_add_test(tst_qwidgetsinqml
     SOURCES
         tst_qwidgetsinqml.cpp
     DEFINES
diff --git a/tests/auto/qml/v4misc/CMakeLists.txt b/tests/auto/qml/v4misc/CMakeLists.txt
index 65a2d26139..1e0435b939 100644
--- a/tests/auto/qml/v4misc/CMakeLists.txt
+++ b/tests/auto/qml/v4misc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_v4misc Test:
 #####################################################################
 
-qt_add_test(tst_v4misc
+qt_internal_add_test(tst_v4misc
     SOURCES
         tst_v4misc.cpp
     PUBLIC_LIBRARIES
author	Alexandru Croitor <alexandru.croitor@qt.io>	2020-09-22 15:23:08 +0200
committer	Alexandru Croitor <alexandru.croitor@qt.io>	2020-10-06 13:19:37 +0200
commit	08adbefa131ef1c934f55cd61716c8ea836ddf02 (patch)
tree	0ae21548926596fb41e7e71c4bb14d1973245bde /tests/auto/qml
parent	c52a857c2b6b89abeddeee8489110ab9dd363e53 (diff)