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>

39 files changed, 38 insertions, 66 deletions

diff --git a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt
index d3d30f5928..867388cfbf 100644
--- a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicint Test:
 #####################################################################
 
-qt_add_test(tst_qatomicint
+qt_internal_add_test(tst_qatomicint
     SOURCES
         tst_qatomicint.cpp
 )
diff --git a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt
index 527302cdd4..57601dc0e4 100644
--- a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_char Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_char
+qt_internal_add_test(tst_qatomicinteger_char
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt
index 6fb1c8e975..6ac58c9136 100644
--- a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_char16_t Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_char16_t
+qt_internal_add_test(tst_qatomicinteger_char16_t
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt
index 9a42a2ef09..911e9f5067 100644
--- a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_char32_t Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_char32_t
+qt_internal_add_test(tst_qatomicinteger_char32_t
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt
index 32a529ea60..be59e2dc98 100644
--- a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_int Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_int
+qt_internal_add_test(tst_qatomicinteger_int
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt
index 974cb2bb9d..3f632ff212 100644
--- a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_long Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_long
+qt_internal_add_test(tst_qatomicinteger_long
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt
index bbee7fcb85..3de9227bb1 100644
--- a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_qlonglong Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_qlonglong
+qt_internal_add_test(tst_qatomicinteger_qlonglong
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt
index 9dbff18228..cc6b5126d9 100644
--- a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_qptrdiff Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_qptrdiff
+qt_internal_add_test(tst_qatomicinteger_qptrdiff
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt
index f5ef36f407..44cf39f06d 100644
--- a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_quintptr Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_quintptr
+qt_internal_add_test(tst_qatomicinteger_quintptr
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt
index 5a783b941e..18d3e384b9 100644
--- a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_qulonglong Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_qulonglong
+qt_internal_add_test(tst_qatomicinteger_qulonglong
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt
index 869473d0c9..760967532a 100644
--- a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_schar Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_schar
+qt_internal_add_test(tst_qatomicinteger_schar
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt
index a90621584e..3f762e34ab 100644
--- a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_short Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_short
+qt_internal_add_test(tst_qatomicinteger_short
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt
index a2ee999970..912365a6e9 100644
--- a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_uchar Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_uchar
+qt_internal_add_test(tst_qatomicinteger_uchar
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt
index f1eec6140f..725fa91704 100644
--- a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_uint Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_uint
+qt_internal_add_test(tst_qatomicinteger_uint
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt
index eba2944e44..d5d35f587d 100644
--- a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_ulong Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_ulong
+qt_internal_add_test(tst_qatomicinteger_ulong
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt
index fe19fc42fc..fd7c002345 100644
--- a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_ushort Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_ushort
+qt_internal_add_test(tst_qatomicinteger_ushort
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt
index dfc4e6ee37..aecb81005c 100644
--- a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicinteger_wchar_t Test:
 #####################################################################
 
-qt_add_test(tst_qatomicinteger_wchar_t
+qt_internal_add_test(tst_qatomicinteger_wchar_t
     SOURCES
         ../tst_qatomicinteger.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt
index 09c8c448df..2c3f32d7e3 100644
--- a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qatomicpointer Test:
 #####################################################################
 
-qt_add_test(tst_qatomicpointer
+qt_internal_add_test(tst_qatomicpointer
     SOURCES
         tst_qatomicpointer.cpp
 )
diff --git a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt
index 6908bd678c..8869f1ba84 100644
--- a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfuture Test:
 #####################################################################
 
-qt_add_test(tst_qfuture
+qt_internal_add_test(tst_qfuture
     SOURCES
         tst_qfuture.cpp
     DEFINES
diff --git a/tests/auto/corelib/thread/qfuture/CMakeLists.txt b/tests/auto/corelib/thread/qfuture/CMakeLists.txt
index 6fdfc977e9..dcf7846fd2 100644
--- a/tests/auto/corelib/thread/qfuture/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qfuture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfuture Test:
 #####################################################################
 
-qt_add_test(tst_qfuture
+qt_internal_add_test(tst_qfuture
     SOURCES
         tst_qfuture.cpp
 #    DEFINES
diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt
index 3ebd266084..e41b8e70c6 100644
--- a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfuturesynchronizer Test:
 #####################################################################
 
-qt_add_test(tst_qfuturesynchronizer
+qt_internal_add_test(tst_qfuturesynchronizer
     SOURCES
         tst_qfuturesynchronizer.cpp
 )
diff --git a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
index a6771e538e..93ac2dd870 100644
--- a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfuturewatcher Test:
 #####################################################################
 
-qt_add_test(tst_qfuturewatcher
+qt_internal_add_test(tst_qfuturewatcher
     SOURCES
         tst_qfuturewatcher.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/thread/qmutex/CMakeLists.txt b/tests/auto/corelib/thread/qmutex/CMakeLists.txt
index ee7bcde85f..41b7b1da68 100644
--- a/tests/auto/corelib/thread/qmutex/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qmutex/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmutex Test:
 #####################################################################
 
-qt_add_test(tst_qmutex
+qt_internal_add_test(tst_qmutex
     SOURCES
         tst_qmutex.cpp
 )
@@ -12,7 +12,7 @@ qt_add_test(tst_qmutex
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmutex CONDITION WIN32
+qt_internal_extend_target(tst_qmutex CONDITION WIN32
     PUBLIC_LIBRARIES
         Qt::CorePrivate
 )
diff --git a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt
index 2f85dd512f..b73d0d073d 100644
--- a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmutexlocker Test:
 #####################################################################
 
-qt_add_test(tst_qmutexlocker
+qt_internal_add_test(tst_qmutexlocker
     SOURCES
         tst_qmutexlocker.cpp
 )
diff --git a/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt
deleted file mode 100644
index dc25a38fea..0000000000
--- a/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Generated from qpromise.pro.
-
-#####################################################################
-## tst_qpromise Test:
-#####################################################################
-
-qt_add_test(tst_qpromise
-    SOURCES
-        tst_qpromise.cpp
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-)
diff --git a/tests/auto/corelib/thread/qpromise/CMakeLists.txt b/tests/auto/corelib/thread/qpromise/CMakeLists.txt
index dc25a38fea..b841c7812b 100644
--- a/tests/auto/corelib/thread/qpromise/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qpromise/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpromise Test:
 #####################################################################
 
-qt_add_test(tst_qpromise
+qt_internal_add_test(tst_qpromise
     SOURCES
         tst_qpromise.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt
index 245fb52dfc..da6091d588 100644
--- a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qreadlocker Test:
 #####################################################################
 
-qt_add_test(tst_qreadlocker
+qt_internal_add_test(tst_qreadlocker
     SOURCES
         tst_qreadlocker.cpp
 )
diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
index fbd8ebf408..4b81229024 100644
--- a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qreadwritelock Test:
 #####################################################################
 
-qt_add_test(tst_qreadwritelock
+qt_internal_add_test(tst_qreadwritelock
     SOURCES
         tst_qreadwritelock.cpp
 )
diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
index c75794cb25..ca30061d15 100644
--- a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qresultstore Test:
 #####################################################################
 
-qt_add_test(tst_qresultstore
+qt_internal_add_test(tst_qresultstore
     SOURCES
         tst_qresultstore.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt
index d83e088004..1860347448 100644
--- a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsemaphore Test:
 #####################################################################
 
-qt_add_test(tst_qsemaphore
+qt_internal_add_test(tst_qsemaphore
     SOURCES
         tst_qsemaphore.cpp
 )
diff --git a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt
deleted file mode 100644
index 2c92a710b3..0000000000
--- a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated from qthread.pro.
-
-#####################################################################
-## tst_qthread Test:
-#####################################################################
-
-qt_add_test(tst_qthread
-    SOURCES
-        ../../../../shared/emulationdetector.h
-        tst_qthread.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../shared
-)
-
-## Scopes:
-#####################################################################
diff --git a/tests/auto/corelib/thread/qthread/CMakeLists.txt b/tests/auto/corelib/thread/qthread/CMakeLists.txt
index 2c92a710b3..b3662f31da 100644
--- a/tests/auto/corelib/thread/qthread/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthread/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qthread Test:
 #####################################################################
 
-qt_add_test(tst_qthread
+qt_internal_add_test(tst_qthread
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qthread.cpp
diff --git a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt
index 1b5b77cfd8..cd4aaa5d72 100644
--- a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qthreadonce Test:
 #####################################################################
 
-qt_add_test(tst_qthreadonce
+qt_internal_add_test(tst_qthreadonce
     SOURCES
         qthreadonce.cpp
         tst_qthreadonce.cpp
diff --git a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt
index 8d2c3719c6..ebf9fc104f 100644
--- a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qthreadpool Test:
 #####################################################################
 
-qt_add_test(tst_qthreadpool
+qt_internal_add_test(tst_qthreadpool
     SOURCES
         tst_qthreadpool.cpp
 )
diff --git a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
index e57f0c71ac..1340b30388 100644
--- a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
@@ -5,7 +5,7 @@
 ## tst_qthreadstorage Test:
 #####################################################################
 
-add_qt_test(tst_qthreadstorage
+qt_internal_add_test(tst_qthreadstorage
     SOURCES
         tst_qthreadstorage.cpp
 )
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt
index 8a8e24587d..eaf743ab86 100644
--- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## crashonexit Binary:
 #####################################################################
 
-qt_add_executable(crashonexit
+qt_internal_add_executable(crashonexit
     OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit"
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit"
     SOURCES
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
index 0951c7df53..a6de9678c0 100644
--- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## crashonexit Binary:
 #####################################################################
 
-qt_add_executable(crashOnExit_helper # special case
+qt_internal_add_executable(crashOnExit_helper # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case
     SOURCES
diff --git a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt
index 91db59c391..e600ff3a42 100644
--- a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwaitcondition Test:
 #####################################################################
 
-qt_add_test(tst_qwaitcondition
+qt_internal_add_test(tst_qwaitcondition
     SOURCES
         tst_qwaitcondition.cpp
 )
diff --git a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt
index 5db1124951..200fa2ee3c 100644
--- a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwritelocker Test:
 #####################################################################
 
-qt_add_test(tst_qwritelocker
+qt_internal_add_test(tst_qwritelocker
     SOURCES
         tst_qwritelocker.cpp
 )