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>

34 files changed, 45 insertions, 127 deletions

diff --git a/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt
index 08d1338d02..9d5d5bfc1c 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qcoreapplication Test:
 #####################################################################
 
-qt_add_test(tst_qcoreapplication
+qt_internal_add_test(tst_qcoreapplication
     SOURCES
         tst_qcoreapplication.cpp tst_qcoreapplication.h
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt
index e552860688..24be474f90 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt
@@ -16,7 +16,7 @@ else()
 endif()
 # special case end
 
-qt_add_test(tst_qcoreapplication
+qt_internal_add_test(tst_qcoreapplication
     VERSION ${target_version} # special case
     SOURCES
         tst_qcoreapplication.cpp tst_qcoreapplication.h
diff --git a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
index 933f8e937e..8c8721abf5 100644
--- a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdeadlinetimer Test:
 #####################################################################
 
-qt_add_test(tst_qdeadlinetimer
+qt_internal_add_test(tst_qdeadlinetimer
     SOURCES
         tst_qdeadlinetimer.cpp
 )
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
index e88fb72bec..1592303ae3 100644
--- a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qelapsedtimer Test:
 #####################################################################
 
-qt_add_test(tst_qelapsedtimer
+qt_internal_add_test(tst_qelapsedtimer
     SOURCES
         tst_qelapsedtimer.cpp
 )
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
index 1893dedc30..409764a2c7 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qeventdispatcher Test:
 #####################################################################
 
-qt_add_test(tst_qeventdispatcher
+qt_internal_add_test(tst_qeventdispatcher
     SOURCES
         tst_qeventdispatcher.cpp
 )
diff --git a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
index b09f6715e1..d3b817598e 100644
--- a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qeventloop Test:
 #####################################################################
 
-qt_add_test(tst_qeventloop
+qt_internal_add_test(tst_qeventloop
     SOURCES
         tst_qeventloop.cpp
     PUBLIC_LIBRARIES
@@ -15,12 +15,12 @@ qt_add_test(tst_qeventloop
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qeventloop CONDITION WIN32
+qt_internal_extend_target(tst_qeventloop CONDITION WIN32
     PUBLIC_LIBRARIES
         user32
 )
 
-qt_extend_target(tst_qeventloop CONDITION QT_FEATURE_glib
+qt_internal_extend_target(tst_qeventloop CONDITION QT_FEATURE_glib
     DEFINES
         HAVE_GLIB
 )
diff --git a/tests/auto/corelib/kernel/qmath/CMakeLists.txt b/tests/auto/corelib/kernel/qmath/CMakeLists.txt
index 4174144141..7a6d4bd688 100644
--- a/tests/auto/corelib/kernel/qmath/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmath/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmath Test:
 #####################################################################
 
-qt_add_test(tst_qmath
+qt_internal_add_test(tst_qmath
     SOURCES
         tst_qmath.cpp
 )
diff --git a/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt b/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt
index 6f0192155d..1e2ca88484 100644
--- a/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "./typeFlags.bin")
 
-qt_add_test(tst_qmetacontainer
+qt_internal_add_test(tst_qmetacontainer
     SOURCES
         tst_qmetacontainer.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
index eba96be7db..daee210588 100644
--- a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmetaenum Test:
 #####################################################################
 
-qt_add_test(tst_qmetaenum
+qt_internal_add_test(tst_qmetaenum
     SOURCES
         tst_qmetaenum.cpp
 )
diff --git a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
index 5062dc7a3f..6ab3f143ac 100644
--- a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmetamethod Test:
 #####################################################################
 
-qt_add_test(tst_qmetamethod
+qt_internal_add_test(tst_qmetamethod
     SOURCES
         tst_qmetamethod.cpp
 )
diff --git a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
index 0a9a839505..d0736f418d 100644
--- a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmetaobject Test:
 #####################################################################
 
-qt_add_test(tst_qmetaobject
+qt_internal_add_test(tst_qmetaobject
     SOURCES
         tst_qmetaobject.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
index bae83c137f..2171b18b2f 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmetaobjectbuilder Test:
 #####################################################################
 
-qt_add_test(tst_qmetaobjectbuilder
+qt_internal_add_test(tst_qmetaobjectbuilder
     SOURCES
         tst_qmetaobjectbuilder.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
index 0c9c0a810c..b69be31b1e 100644
--- a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmetaproperty Test:
 #####################################################################
 
-qt_add_test(tst_qmetaproperty
+qt_internal_add_test(tst_qmetaproperty
     SOURCES
         tst_qmetaproperty.cpp
 )
diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
deleted file mode 100644
index 16188d2d33..0000000000
--- a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated from qmetatype.pro.
-
-#####################################################################
-## tst_qmetatype Test:
-#####################################################################
-
-# Collect test data
-list(APPEND test_data "./typeFlags.bin")
-
-qt_add_test(tst_qmetatype
-    SOURCES
-        tst_qmetatype.cpp
-    DEFINES
-        QT_DISABLE_DEPRECATED_BEFORE=0
-    INCLUDE_DIRECTORIES
-        ../../../other/qvariant_common
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-    TESTDATA ${test_data}
-)
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(tst_qmetatype CONDITION MSVC
-    COMPILE_OPTIONS
-        /bigobj
-)
-
-#### Keys ignored in scope 3:.:.:qmetatype.pro:CLANG:
-# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
-# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
-
-qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
-    DEFINES
-        TST_QMETATYPE_BROKEN_COMPILER
-)
diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
index 16188d2d33..d3e576127f 100644
--- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "./typeFlags.bin")
 
-qt_add_test(tst_qmetatype
+qt_internal_add_test(tst_qmetatype
     SOURCES
         tst_qmetatype.cpp
     DEFINES
@@ -23,7 +23,7 @@ qt_add_test(tst_qmetatype
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmetatype CONDITION MSVC
+qt_internal_extend_target(tst_qmetatype CONDITION MSVC
     COMPILE_OPTIONS
         /bigobj
 )
@@ -32,7 +32,7 @@ qt_extend_target(tst_qmetatype CONDITION MSVC
 # QMAKE_CFLAGS_RELEASE = "--O2" "--g"
 # QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
 
-qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
+qt_internal_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
     DEFINES
         TST_QMETATYPE_BROKEN_COMPILER
 )
diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
index 4400dfd46e..ec5505d3e0 100644
--- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmimedata Test:
 #####################################################################
 
-qt_add_test(tst_qmimedata
+qt_internal_add_test(tst_qmimedata
     SOURCES
         tst_qmimedata.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt
index ea894ff3d3..67ec3b7631 100644
--- a/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qobject Test:
 #####################################################################
 
-qt_add_test(tst_qobject
+qt_internal_add_test(tst_qobject
     SOURCES
         tst_qobject.cpp
     DEFINES
diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
index 47179410b0..7ff42f7212 100644
--- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qobject Test:
 #####################################################################
 
-qt_add_test(tst_qobject
+qt_internal_add_test(tst_qobject
     SOURCES
         tst_qobject.cpp
     DEFINES
diff --git a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
index 9dadd94f04..b479ada78e 100644
--- a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## signalbug_helper Binary:
 #####################################################################
 
-qt_add_test_helper(signalbug_helper
+qt_internal_add_test_helper(signalbug_helper
     SOURCES
         signalbug.cpp signalbug.h
 )
diff --git a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
index a24f25b087..cfafc1eb11 100644
--- a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpointer Test:
 #####################################################################
 
-qt_add_test(tst_qpointer
+qt_internal_add_test(tst_qpointer
     SOURCES
         tst_qpointer.cpp
 )
@@ -12,7 +12,7 @@ qt_add_test(tst_qpointer
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpointer CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(tst_qpointer CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/corelib/kernel/qproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qproperty/CMakeLists.txt
index 5521111ef8..55a5d71752 100644
--- a/tests/auto/corelib/kernel/qproperty/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qproperty/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qproperty Test:
 #####################################################################
 
-qt_add_test(tst_qproperty
+qt_internal_add_test(tst_qproperty
     SOURCES
         tst_qproperty.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt
index 90a9c9e17c..0f654b0691 100644
--- a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
     ## tst_qsharedmemory Test:
     #####################################################################
 
-    qt_add_test(tst_qsharedmemory
+    qt_internal_add_test(tst_qsharedmemory
         SOURCES
             tst_qsharedmemory.cpp
         PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@
     ## Scopes:
     #####################################################################
 
-    qt_extend_target(tst_qsharedmemory CONDITION LINUX
+    qt_internal_extend_target(tst_qsharedmemory CONDITION LINUX
     PUBLIC_LIBRARIES
         rt
     )
diff --git a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
index 8fb89d9af9..f853f00440 100644
--- a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
@@ -5,7 +5,7 @@ if(QT_FEATURE_sharedmemory) # special case
     ## tst_qsharedmemory Test:
     #####################################################################
 
-    qt_add_test(tst_qsharedmemory
+    qt_internal_add_test(tst_qsharedmemory
         SOURCES
             tst_qsharedmemory.cpp
         PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ if(QT_FEATURE_sharedmemory) # special case
     ## Scopes:
     #####################################################################
 
-    qt_extend_target(tst_qsharedmemory CONDITION LINUX
+    qt_internal_extend_target(tst_qsharedmemory CONDITION LINUX
     PUBLIC_LIBRARIES
         rt
     )
diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
index 31d7f0386e..610e2d507f 100644
--- a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## producerconsumer_helper Binary:
 #####################################################################
 
-qt_add_test_helper(producerconsumer_helper
+qt_internal_add_test_helper(producerconsumer_helper
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
index a7a6306bfc..ff5a20bcad 100644
--- a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsignalblocker Test:
 #####################################################################
 
-qt_add_test(tst_qsignalblocker
+qt_internal_add_test(tst_qsignalblocker
     SOURCES
         tst_qsignalblocker.cpp
 )
diff --git a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
index 9ce292c242..064b6722f8 100644
--- a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsignalmapper Test:
 #####################################################################
 
-qt_add_test(tst_qsignalmapper
+qt_internal_add_test(tst_qsignalmapper
     SOURCES
         tst_qsignalmapper.cpp
 )
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
index 2367a8a54e..d5b00ae69f 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qsocketnotifier Test:
 #####################################################################
 
-qt_add_test(tst_qsocketnotifier
+qt_internal_add_test(tst_qsocketnotifier
     SOURCES
         tst_qsocketnotifier.cpp
     INCLUDE_DIRECTORIES
@@ -25,7 +25,7 @@ qt_add_test(tst_qsocketnotifier
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qsocketnotifier CONDITION WIN32
+qt_internal_extend_target(tst_qsocketnotifier CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
index 0024c522e4..1c091bd979 100644
--- a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsystemsemaphore Test:
 #####################################################################
 
-qt_add_test(tst_qsystemsemaphore
+qt_internal_add_test(tst_qsystemsemaphore
     SOURCES
         tst_qsystemsemaphore.cpp
 )
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
index 74f7bf3f61..f34076350e 100644
--- a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## acquirerelease_helper Binary:
 #####################################################################
 
-qt_add_test_helper(acquirerelease_helper
+qt_internal_add_test_helper(acquirerelease_helper
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
index d6e41f6344..39a40b6983 100644
--- a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtimer Test:
 #####################################################################
 
-qt_add_test(tst_qtimer
+qt_internal_add_test(tst_qtimer
     SOURCES
         tst_qtimer.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
index e1cefa3325..e6dc145472 100644
--- a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtranslator Test:
 #####################################################################
 
-qt_add_test(tst_qtranslator
+qt_internal_add_test(tst_qtranslator
     SOURCES
         tst_qtranslator.cpp
 )
@@ -15,7 +15,7 @@ set(qtranslator_resource_files
     "hellotr_la.qm"
 )
 
-qt_add_resource(tst_qtranslator "qtranslator"
+qt_internal_add_resource(tst_qtranslator "qtranslator"
     PREFIX
         "/tst_qtranslator"
     FILES
@@ -35,7 +35,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "msgfmt_from_po.qm"
     )
 
-    qt_add_resource(tst_qtranslator "android_testdata"
+    qt_internal_add_resource(tst_qtranslator "android_testdata"
         PREFIX
             "/android_testdata"
         FILES
diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt
deleted file mode 100644
index 9534e22368..0000000000
--- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-# Generated from qvariant.pro.
-
-#####################################################################
-## tst_qvariant Test:
-#####################################################################
-
-qt_add_test(tst_qvariant
-    SOURCES
-        tst_qvariant.cpp
-    DEFINES
-        QT_DISABLE_DEPRECATED_BEFORE=0
-    INCLUDE_DIRECTORIES
-        ../../../other/qvariant_common
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-)
-
-# Resources:
-set(qvariant_resource_files
-    "stream/qt4.9/"
-    "stream/qt5.0/"
-)
-
-qt_add_resource(tst_qvariant "qvariant"
-    PREFIX
-        "/"
-    FILES
-        ${qvariant_resource_files}
-)
-
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(tst_qvariant CONDITION MSVC
-    COMPILE_OPTIONS
-        /bigobj
-)
-
-qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
-    DEFINES
-        QT_NO_DOUBLECONVERSION
-)
diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
index 9534e22368..45bfa4e480 100644
--- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qvariant Test:
 #####################################################################
 
-qt_add_test(tst_qvariant
+qt_internal_add_test(tst_qvariant
     SOURCES
         tst_qvariant.cpp
     DEFINES
@@ -22,7 +22,7 @@ set(qvariant_resource_files
     "stream/qt5.0/"
 )
 
-qt_add_resource(tst_qvariant "qvariant"
+qt_internal_add_resource(tst_qvariant "qvariant"
     PREFIX
         "/"
     FILES
@@ -33,12 +33,12 @@ qt_add_resource(tst_qvariant "qvariant"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qvariant CONDITION MSVC
+qt_internal_extend_target(tst_qvariant CONDITION MSVC
     COMPILE_OPTIONS
         /bigobj
 )
 
-qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
+qt_internal_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
     DEFINES
         QT_NO_DOUBLECONVERSION
 )
diff --git a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
index 7974c3765b..b9bcb36771 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwineventnotifier Test:
 #####################################################################
 
-qt_add_test(tst_qwineventnotifier
+qt_internal_add_test(tst_qwineventnotifier
     SOURCES
         tst_qwineventnotifier.cpp
     PUBLIC_LIBRARIES