CMake: Regenerate projects to use new qt_internal_ API

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

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

70 files changed, 110 insertions, 110 deletions

diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt
index 6e9a3cbae8..be4b21033f 100644
--- a/tests/auto/corelib/io/largefile/CMakeLists.txt
+++ b/tests/auto/corelib/io/largefile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_largefile Test:
 #####################################################################
 
-qt_add_test(tst_largefile
+qt_internal_add_test(tst_largefile
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_largefile.cpp
diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
index 8267c7241c..7e3b79403d 100644
--- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
+++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractfileengine Test:
 #####################################################################
 
-qt_add_test(tst_qabstractfileengine
+qt_internal_add_test(tst_qabstractfileengine
     SOURCES
         tst_qabstractfileengine.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(qabstractfileengine_resource_files
     "resources/"
 )
 
-qt_add_resource(tst_qabstractfileengine "qabstractfileengine"
+qt_internal_add_resource(tst_qabstractfileengine "qabstractfileengine"
     PREFIX
         "/tst_qabstractfileengine/"
     FILES
diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
index 5a374173ef..7d57d78b3f 100644
--- a/tests/auto/corelib/io/qbuffer/CMakeLists.txt
+++ b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbuffer Test:
 #####################################################################
 
-qt_add_test(tst_qbuffer
+qt_internal_add_test(tst_qbuffer
     SOURCES
         tst_qbuffer.cpp
 )
diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
index 8020879311..b13a235d3b 100644
--- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdataurl Test:
 #####################################################################
 
-qt_add_test(tst_qdataurl
+qt_internal_add_test(tst_qdataurl
     SOURCES
         tst_qdataurl.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt
index 6656b6089b..39b92b9d2f 100644
--- a/tests/auto/corelib/io/qdebug/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdebug Test:
 #####################################################################
 
-qt_add_test(tst_qdebug
+qt_internal_add_test(tst_qdebug
     SOURCES
         tst_qdebug.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt
index 49711da087..4c26780f99 100644
--- a/tests/auto/corelib/io/qdir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND test_data "entrylist")
 list(APPEND test_data "types")
 list(APPEND test_data "tst_qdir.cpp")
 
-qt_add_test(tst_qdir
+qt_internal_add_test(tst_qdir
     SOURCES
         tst_qdir.cpp
     PUBLIC_LIBRARIES
@@ -26,7 +26,7 @@ set(qdir_resource_files
     "resources/entryList/"
 )
 
-qt_add_resource(tst_qdir "qdir"
+qt_internal_add_resource(tst_qdir "qdir"
     PREFIX
         "/tst_qdir/"
     FILES
@@ -40,7 +40,7 @@ qt_add_resource(tst_qdir "qdir"
 #### Keys ignored in scope 2:.:.:qdir.pro:IOS:
 # QMAKE_INFO_PLIST = "Info.plist"
 
-qt_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
+qt_internal_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
@@ -90,7 +90,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "types/f/dummy"
     )
 
-    qt_add_resource(tst_qdir "android_testdata"
+    qt_internal_add_resource(tst_qdir "android_testdata"
         PREFIX
             "/android_testdata"
         FILES
diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
index 19e64e037c..92ce7b4e89 100644
--- a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qdir Binary:
 #####################################################################
 
-qt_add_executable(qdir
+qt_internal_add_executable(qdir
     GUI
     DEFINES
         QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
index 39703e8c83..feb742396d 100644
--- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "entrylist")
 
-qt_add_test(tst_qdiriterator
+qt_internal_add_test(tst_qdiriterator
     SOURCES
         tst_qdiriterator.cpp
     PUBLIC_LIBRARIES
@@ -21,7 +21,7 @@ set(qdiriterator_resource_files
     "entrylist/file"
 )
 
-qt_add_resource(tst_qdiriterator "qdiriterator"
+qt_internal_add_resource(tst_qdiriterator "qdiriterator"
     PREFIX
         "/testdata/"
     FILES
@@ -32,7 +32,7 @@ qt_add_resource(tst_qdiriterator "qdiriterator"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
+qt_internal_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
index 8e72a89649..e32930f55a 100644
--- a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt")
 list(APPEND test_data "forRenaming.txt")
 list(APPEND test_data "resources/file1.ext1")
 
-qt_add_test(tst_qfile
+qt_internal_add_test(tst_qfile
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qfile.cpp
@@ -33,7 +33,7 @@ set(qfile_resource_files
     "resources/"
 )
 
-qt_add_resource(tst_qfile "qfile"
+qt_internal_add_resource(tst_qfile "qfile"
     PREFIX
         "/tst_qfileinfo/"
     FILES
@@ -43,7 +43,7 @@ set(rename-fallback_resource_files
     "rename-fallback.qrc"
 )
 
-qt_add_resource(tst_qfile "rename-fallback"
+qt_internal_add_resource(tst_qfile "rename-fallback"
     PREFIX
         "/"
     FILES
@@ -53,7 +53,7 @@ set(copy-fallback_resource_files
     "copy-fallback.qrc"
 )
 
-qt_add_resource(tst_qfile "copy-fallback"
+qt_internal_add_resource(tst_qfile "copy-fallback"
     PREFIX
         "/"
     FILES
@@ -64,22 +64,22 @@ qt_add_resource(tst_qfile "copy-fallback"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qfile CONDITION TARGET Qt::Network
+qt_internal_extend_target(tst_qfile CONDITION TARGET Qt::Network
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
+qt_internal_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
     DEFINES
         QT_NO_NETWORK
 )
 
-qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
+qt_internal_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
 
-qt_extend_target(tst_qfile CONDITION WIN32
+qt_internal_extend_target(tst_qfile CONDITION WIN32
     PUBLIC_LIBRARIES
         ole32
         uuid
diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt
index 916b291f54..7a0102bfd9 100644
--- a/tests/auto/corelib/io/qfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt")
 list(APPEND test_data "forRenaming.txt")
 list(APPEND test_data "resources/file1.ext1")
 
-qt_add_test(tst_qfile
+qt_internal_add_test(tst_qfile
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qfile.cpp
@@ -33,7 +33,7 @@ set(qfile_resource_files
     "resources/"
 )
 
-qt_add_resource(tst_qfile "qfile"
+qt_internal_add_resource(tst_qfile "qfile"
     PREFIX
         "/tst_qfileinfo/"
     FILES
@@ -43,7 +43,7 @@ set(rename-fallback_resource_files
     "rename-fallback.qrc"
 )
 
-qt_add_resource(tst_qfile "rename-fallback"
+qt_internal_add_resource(tst_qfile "rename-fallback"
     PREFIX
         "/"
     FILES
@@ -53,7 +53,7 @@ set(copy-fallback_resource_files
     "copy-fallback.qrc"
 )
 
-qt_add_resource(tst_qfile "copy-fallback"
+qt_internal_add_resource(tst_qfile "copy-fallback"
     PREFIX
         "/"
     FILES
@@ -64,22 +64,22 @@ qt_add_resource(tst_qfile "copy-fallback"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qfile CONDITION TARGET Qt::Network
+qt_internal_extend_target(tst_qfile CONDITION TARGET Qt::Network
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
+qt_internal_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
     DEFINES
         QT_NO_NETWORK
 )
 
-qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
+qt_internal_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
 
-qt_extend_target(tst_qfile CONDITION WIN32
+qt_internal_extend_target(tst_qfile CONDITION WIN32
     PUBLIC_LIBRARIES
         ole32
         uuid
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
index eb1f6a0ff0..e034e0502c 100644
--- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## stdinprocess_helper Binary:
 #####################################################################
 
-qt_add_test_helper(stdinprocess_helper
+qt_internal_add_test_helper(stdinprocess_helper
     SOURCES
         main.cpp
 )
diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
index a7ccda9c58..da955ff6a6 100644
--- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfileinfo Test:
 #####################################################################
 
-qt_add_test(tst_qfileinfo
+qt_internal_add_test(tst_qfileinfo
     SOURCES
         tst_qfileinfo.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(qfileinfo_resource_files
     "resources/"
 )
 
-qt_add_resource(tst_qfileinfo "qfileinfo"
+qt_internal_add_resource(tst_qfileinfo "qfileinfo"
     PREFIX
         "/tst_qfileinfo/"
     FILES
@@ -29,7 +29,7 @@ set(testdata_resource_files
     "tst_qfileinfo.cpp"
 )
 
-qt_add_resource(tst_qfileinfo "testdata"
+qt_internal_add_resource(tst_qfileinfo "testdata"
     PREFIX
         "/testdata"
     FILES
@@ -40,7 +40,7 @@ qt_add_resource(tst_qfileinfo "testdata"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qfileinfo CONDITION WIN32
+qt_internal_extend_target(tst_qfileinfo CONDITION WIN32
     PUBLIC_LIBRARIES
         advapi32
         netapi32
diff --git a/tests/auto/corelib/io/qfileselector/CMakeLists.txt b/tests/auto/corelib/io/qfileselector/CMakeLists.txt
index 67840c8112..5f254044df 100644
--- a/tests/auto/corelib/io/qfileselector/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfileselector/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfileselectors Test:
 #####################################################################
 
-qt_add_test(tst_qfileselectors
+qt_internal_add_test(tst_qfileselectors
     SOURCES
         tst_qfileselector.cpp
     PUBLIC_LIBRARIES
@@ -62,7 +62,7 @@ set(qfileselector_resource_files
     "platforms/test5"
 )
 
-qt_add_resource(tst_qfileselectors "qfileselector"
+qt_internal_add_resource(tst_qfileselectors "qfileselector"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
index a99884b617..574ba0efc8 100644
--- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfilesystementry Test:
 #####################################################################
 
-qt_add_test(tst_qfilesystementry
+qt_internal_add_test(tst_qfilesystementry
     SOURCES
         ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h
         tst_qfilesystementry.cpp
diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
index 4970e5a426..9b1705f072 100644
--- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfilesystemmetadata Test:
 #####################################################################
 
-qt_add_test(tst_qfilesystemmetadata
+qt_internal_add_test(tst_qfilesystemmetadata
     SOURCES
         tst_qfilesystemmetadata.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
index ac72470019..7523122907 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfilesystemwatcher Test:
 #####################################################################
 
-qt_add_test(tst_qfilesystemwatcher
+qt_internal_add_test(tst_qfilesystemwatcher
     SOURCES
         tst_qfilesystemwatcher.cpp
 )
diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
index fdc896e45d..3fa19d9f30 100644
--- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt
+++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "tst_qiodevice.cpp")
 
-qt_add_test(tst_qiodevice
+qt_internal_add_test(tst_qiodevice
     SOURCES
         tst_qiodevice.cpp
     PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "tst_qiodevice.cpp"
     )
 
-    qt_add_resource(tst_qiodevice "android_testdata"
+    qt_internal_add_resource(tst_qiodevice "android_testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
index da7f5a9061..b4801c2ab2 100644
--- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt
+++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qipaddress Test:
 #####################################################################
 
-qt_add_test(tst_qipaddress
+qt_internal_add_test(tst_qipaddress
     SOURCES
         tst_qipaddress.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt
index baab320b8c..828aea049e 100644
--- a/tests/auto/corelib/io/qlockfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlockfile Test:
 #####################################################################
 
-qt_add_test(tst_qlockfile
+qt_internal_add_test(tst_qlockfile
     SOURCES
         tst_qlockfile.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ qt_add_test(tst_qlockfile
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qlockfile CONDITION WIN32
+qt_internal_extend_target(tst_qlockfile CONDITION WIN32
     PUBLIC_LIBRARIES
         advapi32
 )
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
index e0f500f8ae..6526d690f9 100644
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlockfile_test_helper Binary:
 #####################################################################
 
-qt_add_executable(qlockfile_test_helper
+qt_internal_add_executable(qlockfile_test_helper
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         qlockfile_test_helper.cpp
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
index 957d60ca1b..8917f2aa34 100644
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlockfile_test_helper Binary:
 #####################################################################
 
-qt_add_test_helper(qlockfile_test_helper # special case
+qt_internal_add_test_helper(qlockfile_test_helper # special case
     OVERRIDE_OUTPUT_DIRECTORY # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
index 778315db5b..13ee586696 100644
--- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qloggingcategory Test:
 #####################################################################
 
-qt_add_test(tst_qloggingcategory
+qt_internal_add_test(tst_qloggingcategory
     SOURCES
         tst_qloggingcategory.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
index e4d1cf4aaf..4c903de17f 100644
--- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "qtlogging.ini")
 
-qt_add_test(tst_qloggingregistry
+qt_internal_add_test(tst_qloggingregistry
     SOURCES
         tst_qloggingregistry.cpp
     PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "qtlogging.ini"
     )
 
-    qt_add_resource(tst_qloggingregistry "android_testdata"
+    qt_internal_add_resource(tst_qloggingregistry "android_testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
index fe410643fc..5fd4a3738c 100644
--- a/tests/auto/corelib/io/qnodebug/CMakeLists.txt
+++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnodebug Test:
 #####################################################################
 
-qt_add_test(tst_qnodebug
+qt_internal_add_test(tst_qnodebug
     SOURCES
         tst_qnodebug.cpp
 )
diff --git a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
index ae7910e302..0118d46ae8 100644
--- a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qprocess-noapplication Test:
 #####################################################################
 
-qt_add_test(qprocess-noapplication
+qt_internal_add_test(qprocess-noapplication
     SOURCES
         tst_qprocessnoapplication.cpp
 )
diff --git a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt
index 92b4c258dd..ce4519ce99 100644
--- a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## fileWriterProcess Binary:
 #####################################################################
 
-qt_add_executable(fileWriterProcess
+qt_internal_add_executable(fileWriterProcess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt
index 0541b4258a..249cb089cf 100644
--- a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qprocess Test:
 #####################################################################
 
-qt_add_test(tst_qprocess
+qt_internal_add_test(tst_qprocess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../../../../../shared/emulationdetector.h
diff --git a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt
index a7f9b9412d..368ca92f09 100644
--- a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testDetached Binary:
 #####################################################################
 
-qt_add_executable(testDetached
+qt_internal_add_executable(testDetached
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt
index cf3f6f4e64..26973bfc2d 100644
--- a/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testExitCodes Binary:
 #####################################################################
 
-qt_add_executable(testExitCodes
+qt_internal_add_executable(testExitCodes
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt
index 5ad0ab05df..24f231982e 100644
--- a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testExitCodes Binary:
 #####################################################################
 
-qt_add_executable(testExitCodes
+qt_internal_add_executable(testExitCodes
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt
index 83658e4b7a..914785178c 100644
--- a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testForwarding Binary:
 #####################################################################
 
-qt_add_executable(testForwarding
+qt_internal_add_executable(testForwarding
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt
index 9197f96e10..3fd1385f71 100644
--- a/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testForwardingHelper Binary:
 #####################################################################
 
-qt_add_executable(testForwardingHelper
+qt_internal_add_executable(testForwardingHelper
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt
index 0024b006ed..f13f2f6b03 100644
--- a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testForwardingHelper Binary:
 #####################################################################
 
-qt_add_executable(testForwardingHelper
+qt_internal_add_executable(testForwardingHelper
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt
index bd6853c438..e36a33bfa4 100644
--- a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testGuiProcess Binary:
 #####################################################################
 
-qt_add_executable(testGuiProcess
+qt_internal_add_executable(testGuiProcess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt
index d09e1364fb..c40b850a56 100644
--- a/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessCrash Binary:
 #####################################################################
 
-qt_add_executable(testProcessCrash
+qt_internal_add_executable(testProcessCrash
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt
index 1b2ab3eac5..1afc662a2c 100644
--- a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessCrash Binary:
 #####################################################################
 
-qt_add_executable(testProcessCrash
+qt_internal_add_executable(testProcessCrash
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt
index aade19fa91..9416580e04 100644
--- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessDeadWhileReading Binary:
 #####################################################################
 
-qt_add_executable(testProcessDeadWhileReading
+qt_internal_add_executable(testProcessDeadWhileReading
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt
index 50407cbc7a..55dce67f8a 100644
--- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessDeadWhileReading Binary:
 #####################################################################
 
-qt_add_executable(testProcessDeadWhileReading
+qt_internal_add_executable(testProcessDeadWhileReading
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt
index 7fe205c5d4..b4f2679976 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEOF Binary:
 #####################################################################
 
-qt_add_executable(testProcessEOF
+qt_internal_add_executable(testProcessEOF
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt
index b30249caa9..c3cc35db60 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEOF Binary:
 #####################################################################
 
-qt_add_executable(testProcessEOF
+qt_internal_add_executable(testProcessEOF
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt
index 0db956d16c..c739335d04 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEcho Binary:
 #####################################################################
 
-qt_add_executable(testProcessEcho
+qt_internal_add_executable(testProcessEcho
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt
index db46ca06cb..128f35538b 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEcho Binary:
 #####################################################################
 
-qt_add_executable(testProcessEcho
+qt_internal_add_executable(testProcessEcho
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt
index abe80a3cff..b861f2619c 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEcho2 Binary:
 #####################################################################
 
-qt_add_executable(testProcessEcho2
+qt_internal_add_executable(testProcessEcho2
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt
index 87acd13c16..4b3fb585f4 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEcho2 Binary:
 #####################################################################
 
-qt_add_executable(testProcessEcho2
+qt_internal_add_executable(testProcessEcho2
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt
index 8b7a8b3a51..40e992a947 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEcho3 Binary:
 #####################################################################
 
-qt_add_executable(testProcessEcho3
+qt_internal_add_executable(testProcessEcho3
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt
index f0905360f4..0b852a90ce 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEcho3 Binary:
 #####################################################################
 
-qt_add_executable(testProcessEcho3
+qt_internal_add_executable(testProcessEcho3
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt
index a2e3c6a0a9..2c482b2cf8 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEchoGui Binary:
 #####################################################################
 
-qt_add_executable(testProcessEchoGui
+qt_internal_add_executable(testProcessEchoGui
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     DEFINES
         QT_DISABLE_DEPRECATED_BEFORE=0
@@ -15,7 +15,7 @@ qt_add_executable(testProcessEchoGui
 ## Scopes:
 #####################################################################
 
-qt_extend_target(testProcessEchoGui CONDITION WIN32
+qt_internal_extend_target(testProcessEchoGui CONDITION WIN32
     SOURCES
         main_win.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt
index ca529c0c84..f96c8a4fa5 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEchoGui Binary:
 #####################################################################
 
-qt_add_executable(testProcessEchoGui
+qt_internal_add_executable(testProcessEchoGui
     GUI # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     DEFINES
@@ -16,7 +16,7 @@ qt_add_executable(testProcessEchoGui
 ## Scopes:
 #####################################################################
 
-qt_extend_target(testProcessEchoGui CONDITION WIN32
+qt_internal_extend_target(testProcessEchoGui CONDITION WIN32
     SOURCES
         main_win.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt
index 63d7767b60..6a0546b1aa 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEnvironment Binary:
 #####################################################################
 
-qt_add_executable(testProcessEnvironment
+qt_internal_add_executable(testProcessEnvironment
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt
index 89c41b6446..fe48627b7c 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessEnvironment Binary:
 #####################################################################
 
-qt_add_executable(testProcessEnvironment
+qt_internal_add_executable(testProcessEnvironment
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt
index 77e39937b0..63989dd8e0 100644
--- a/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessHang Binary:
 #####################################################################
 
-qt_add_executable(testProcessHang
+qt_internal_add_executable(testProcessHang
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt
index c3f4857225..3e8443c2a5 100644
--- a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessHang Binary:
 #####################################################################
 
-qt_add_executable(testProcessHang
+qt_internal_add_executable(testProcessHang
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt
index 2348a4b002..1726e1861b 100644
--- a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessNormal Binary:
 #####################################################################
 
-qt_add_executable(testProcessNormal
+qt_internal_add_executable(testProcessNormal
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt
index 4e0b835aa1..2a6d016f48 100644
--- a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessOutput Binary:
 #####################################################################
 
-qt_add_executable(testProcessOutput
+qt_internal_add_executable(testProcessOutput
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt
index f8a21c990d..5d5a049012 100644
--- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nospace Binary:
 #####################################################################
 
-qt_add_executable(nospace
+qt_internal_add_executable(nospace
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt
index 3c0033a01f..fd2b38ef2f 100644
--- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nospace Binary:
 #####################################################################
 
-qt_add_executable(nospace
+qt_internal_add_executable(nospace
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
@@ -15,7 +15,7 @@ qt_add_executable(nospace
 )
 
 # special case begin
-qt_add_executable(onespace
+qt_internal_add_executable(onespace
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
@@ -26,7 +26,7 @@ qt_add_executable(onespace
 )
 set_target_properties(onespace PROPERTIES OUTPUT_NAME "one space")
 
-qt_add_executable(twospaces
+qt_internal_add_executable(twospaces
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt
index 9fc7528b2e..6b55c40f94 100644
--- a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testSetNamedPipeHandleState Binary:
 #####################################################################
 
-qt_add_executable(testSetNamedPipeHandleState
+qt_internal_add_executable(testSetNamedPipeHandleState
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt
index 54a8b1b4d1..97410c1b49 100644
--- a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testSetWorkingDirectory Binary:
 #####################################################################
 
-qt_add_executable(testSetWorkingDirectory
+qt_internal_add_executable(testSetWorkingDirectory
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt
index ec2d9433b2..ab78f9acdb 100644
--- a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt
@@ -4,21 +4,21 @@
 ## testSoftExit Binary:
 #####################################################################
 
-qt_add_executable(testSoftExit
+qt_internal_add_executable(testSoftExit
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
 )
 
 ## Scopes:
 #####################################################################
 
-qt_extend_target(testSoftExit CONDITION WIN32
+qt_internal_extend_target(testSoftExit CONDITION WIN32
     SOURCES
         main_win.cpp
     PUBLIC_LIBRARIES
         user32
 )
 
-qt_extend_target(testSoftExit CONDITION UNIX
+qt_internal_extend_target(testSoftExit CONDITION UNIX
     SOURCES
         main_unix.cpp
 )
diff --git a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt
index 1ca31c59df..e59ad51d6e 100644
--- a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testSpaceInName Binary:
 #####################################################################
 
-qt_add_executable(testSpaceInName
+qt_internal_add_executable(testSpaceInName
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../test Space In Name"
     SOURCES
         main.cpp
diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
index ba935455af..d612a32374 100644
--- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qprocessenvironment Test:
 #####################################################################
 
-qt_add_test(tst_qprocessenvironment
+qt_internal_add_test(tst_qprocessenvironment
     SOURCES
         tst_qprocessenvironment.cpp
 )
diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
index f2c8cf0a56..0b41340279 100644
--- a/tests/auto/corelib/io/qsavefile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "tst_qsavefile.cpp")
 
-qt_add_test(tst_qsavefile
+qt_internal_add_test(tst_qsavefile
     SOURCES
         tst_qsavefile.cpp
     TESTDATA ${test_data}
diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt
index 3cc9547d3c..c12f94cf36 100644
--- a/tests/auto/corelib/io/qsettings/CMakeLists.txt
+++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsettings Test:
 #####################################################################
 
-qt_add_test(tst_qsettings
+qt_internal_add_test(tst_qsettings
     SOURCES
         tst_qsettings.cpp
     DEFINES
@@ -28,7 +28,7 @@ set(qsettings_resource_files
     "withcomments.ini"
 )
 
-qt_add_resource(tst_qsettings "qsettings"
+qt_internal_add_resource(tst_qsettings "qsettings"
     PREFIX
         "/"
     FILES
@@ -39,12 +39,12 @@ qt_add_resource(tst_qsettings "qsettings"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qsettings CONDITION MSVC
+qt_internal_extend_target(tst_qsettings CONDITION MSVC
     PUBLIC_LIBRARIES
         advapi32
 )
 
-qt_extend_target(tst_qsettings CONDITION APPLE
+qt_internal_extend_target(tst_qsettings CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWCoreFoundation}
 )
diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
index 74ec2cd855..0a6f45c8fd 100644
--- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
+++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "tst_qstandardpaths.cpp")
 list(APPEND test_data "qstandardpaths.pro")
 
-qt_add_test(tst_qstandardpaths
+qt_internal_add_test(tst_qstandardpaths
     SOURCES
         tst_qstandardpaths.cpp
     TESTDATA ${test_data}
@@ -17,7 +17,7 @@ qt_add_test(tst_qstandardpaths
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qstandardpaths CONDITION boot2qt
+qt_internal_extend_target(tst_qstandardpaths CONDITION boot2qt
     DEFINES
         SKIP_FINDEXECUTABLE
 )
diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
index e2a47a2832..be3a8c3afe 100644
--- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
+++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstorageinfo Test:
 #####################################################################
 
-qt_add_test(tst_qstorageinfo
+qt_internal_add_test(tst_qstorageinfo
     SOURCES
         tst_qstorageinfo.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
index f1c3db54d0..58eb49dff8 100644
--- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtemporarydir Test:
 #####################################################################
 
-qt_add_test(tst_qtemporarydir
+qt_internal_add_test(tst_qtemporarydir
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qtemporarydir.cpp
diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
index 9b35f72a69..11d4b991ce 100644
--- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "tst_qtemporaryfile.cpp")
 
-qt_add_test(tst_qtemporaryfile
+qt_internal_add_test(tst_qtemporaryfile
     SOURCES
         tst_qtemporaryfile.cpp
     PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ set(qtemporaryfile_resource_files
     "resources/test.txt"
 )
 
-qt_add_resource(tst_qtemporaryfile "qtemporaryfile"
+qt_internal_add_resource(tst_qtemporaryfile "qtemporaryfile"
     PREFIX
         "/"
     FILES
@@ -38,7 +38,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "tst_qtemporaryfile.cpp"
     )
 
-    qt_add_resource(tst_qtemporaryfile "android_testdata"
+    qt_internal_add_resource(tst_qtemporaryfile "android_testdata"
         PREFIX
             "/android_testdata"
         FILES
diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt
index 2ea06f62d7..ce386c142c 100644
--- a/tests/auto/corelib/io/qurl/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qurl Test:
 #####################################################################
 
-qt_add_test(tst_qurl
+qt_internal_add_test(tst_qurl
     SOURCES
         tst_qurl.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_test(tst_qurl
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qurl CONDITION APPLE
+qt_internal_extend_target(tst_qurl CONDITION APPLE
     SOURCES
         tst_qurl_mac.mm
 )
diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
index 80f8e0d128..492ac0a4d6 100644
--- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qurlinternal Test:
 #####################################################################
 
-qt_add_test(tst_qurlinternal
+qt_internal_add_test(tst_qurlinternal
     SOURCES
         tst_qurlinternal.cpp
         utf8data.cpp
diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
index b85e688b45..1d68c01325 100644
--- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qurlquery Test:
 #####################################################################
 
-qt_add_test(tst_qurlquery
+qt_internal_add_test(tst_qurlquery
     SOURCES
         tst_qurlquery.cpp
     DEFINES