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>

53 files changed, 53 insertions, 58 deletions

diff --git a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
index 255befd99a..e83c4e9acc 100644
--- a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qdir_10000 Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qdir_10000
+qt_internal_add_benchmark(tst_bench_qdir_10000
     SOURCES
         bench_qdir_10000.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt
index 1ea925928d..c60bfcfdc3 100644
--- a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## bench_qdir_tree Binary:
 #####################################################################
 
-qt_add_benchmark(bench_qdir_tree
+qt_internal_add_benchmark(bench_qdir_tree
     SOURCES
         bench_qdir_tree.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(bench_qdir_tree_resource_files
     "4.6.0-list.txt"
 )
 
-qt_add_resource(bench_qdir_tree "bench_qdir_tree"
+qt_internal_add_resource(bench_qdir_tree "bench_qdir_tree"
     PREFIX
         "/"
     FILES
diff --git a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt
index b534df5796..8ba331a113 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qdiriterator Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qdiriterator
+qt_internal_add_benchmark(tst_bench_qdiriterator
     SOURCES
         main.cpp
         qfilesystemiterator.cpp qfilesystemiterator.h
@@ -15,7 +15,7 @@ qt_add_benchmark(tst_bench_qdiriterator
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9))
+qt_internal_extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9))
     LINK_OPTIONS
         "-lstdc++fs"
 )
diff --git a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt
index df33c1169f..6ae5029a8a 100644
--- a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qfile Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qfile
+qt_internal_add_benchmark(tst_bench_qfile
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -18,7 +18,7 @@ qt_add_benchmark(tst_bench_qfile
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_bench_qfile CONDITION WIN32
+qt_internal_extend_target(tst_bench_qfile CONDITION WIN32
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
diff --git a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt
index 691c3fb51d..1c088bf71a 100644
--- a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qfileinfo Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qfileinfo
+qt_internal_add_benchmark(tst_bench_qfileinfo
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt
index 21052a584c..3af6d4f214 100644
--- a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qiodevice Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qiodevice
+qt_internal_add_benchmark(tst_bench_qiodevice
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt
index 93cca1827f..ca7011a661 100644
--- a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qprocess Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qprocess
+qt_internal_add_benchmark(tst_bench_qprocess
     SOURCES
         ../tst_bench_qprocess.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt
index 6c67fdbbed..02c50f7df2 100644
--- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessLoopback Binary:
 #####################################################################
 
-add_qt_benchmark(testProcessLoopback
+qt_internal_add_benchmark(testProcessLoopback
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
index 0d0115f785..02c50f7df2 100644
--- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testProcessLoopback Binary:
 #####################################################################
 
-qt_add_benchmark(testProcessLoopback
+qt_internal_add_benchmark(testProcessLoopback
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt
index b9bc9164a7..a12bfd1260 100644
--- a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qtemporaryfile Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qtemporaryfile
+qt_internal_add_benchmark(tst_bench_qtemporaryfile
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt
index d84ba59f41..0393b91119 100644
--- a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qtextstream Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qtextstream
+qt_internal_add_benchmark(tst_bench_qtextstream
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt
index 77ede07536..d38c8b18c0 100644
--- a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qurl Binary:
 #####################################################################
 
-qt_add_benchmark(tst_qurl
+qt_internal_add_benchmark(tst_qurl
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ qt_add_benchmark(tst_qurl
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qurl CONDITION WIN32
+qt_internal_extend_target(tst_qurl CONDITION WIN32
     DEFINES
         _CRT_SECURE_NO_WARNINGS
 )
diff --git a/tests/benchmarks/corelib/json/CMakeLists.txt b/tests/benchmarks/corelib/json/CMakeLists.txt
index 2108deb6bb..657a268741 100644
--- a/tests/benchmarks/corelib/json/CMakeLists.txt
+++ b/tests/benchmarks/corelib/json/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qtjson Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qtjson
+qt_internal_add_benchmark(tst_bench_qtjson
     SOURCES
         tst_bench_qtjson.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt
index e9c5cc694a..41add9350e 100644
--- a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_events Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_events
+qt_internal_add_benchmark(tst_bench_events
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt
index c0d0562869..1618997909 100644
--- a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qcoreapplication Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qcoreapplication
+qt_internal_add_benchmark(tst_bench_qcoreapplication
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt
index 8f7dd52376..db4c3ab12e 100644
--- a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qmetaobject Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qmetaobject
+qt_internal_add_benchmark(tst_bench_qmetaobject
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt
index ad63d9d8c8..ae4bc9c906 100644
--- a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qmetatype Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qmetatype
+qt_internal_add_benchmark(tst_bench_qmetatype
     SOURCES
         tst_qmetatype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt
index 92cffc2980..ce834905b0 100644
--- a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qobject Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qobject
+qt_internal_add_benchmark(tst_bench_qobject
     SOURCES
         main.cpp
         object.cpp object.h
diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt
index 2619d89779..5ba14e43a2 100644
--- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtimer_vs_qmetaobject Binary:
 #####################################################################
 
-qt_add_benchmark(qtimer_vs_qmetaobject
+qt_internal_add_benchmark(qtimer_vs_qmetaobject
     SOURCES
         tst_qtimer_vs_qmetaobject.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt
index f5104b11ff..418fd1da9f 100644
--- a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qvariant Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qvariant
+qt_internal_add_benchmark(tst_bench_qvariant
     SOURCES
         tst_qvariant.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ qt_add_benchmark(tst_bench_qvariant
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui
+qt_internal_extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui
     PUBLIC_LIBRARIES
         # Remove: gui
 )
diff --git a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt
index 7f4ce4df13..7adc043639 100644
--- a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt
+++ b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qmimedatabase Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qmimedatabase
+qt_internal_add_benchmark(tst_bench_qmimedatabase
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt
index 3f8b26c883..3b787dc8e8 100644
--- a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt
+++ b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_quuid Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_quuid
+qt_internal_add_benchmark(tst_bench_quuid
     SOURCES
         tst_quuid.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt
index cdae659c92..50574aa221 100644
--- a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt
+++ b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qbytearray Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qbytearray
+qt_internal_add_benchmark(tst_bench_qbytearray
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt
index af45da6bfa..afdf96e9d4 100644
--- a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt
+++ b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qchar Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qchar
+qt_internal_add_benchmark(tst_bench_qchar
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt
index 830c6dbf12..1c692af6c8 100644
--- a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt
+++ b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qlocale Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qlocale
+qt_internal_add_benchmark(tst_bench_qlocale
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt
index e0f3a0e279..4b443cd4aa 100644
--- a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt
+++ b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qstring Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qstring
+qt_internal_add_benchmark(tst_bench_qstring
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt
index 3182c3faaa..33b1b5fe5e 100644
--- a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt
+++ b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qstringbuilder Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qstringbuilder
+qt_internal_add_benchmark(tst_bench_qstringbuilder
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt
index f62b4a82a1..4649e3408a 100644
--- a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt
+++ b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qstringlist Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qstringlist
+qt_internal_add_benchmark(tst_bench_qstringlist
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt
index 4ba55034d8..8872a50227 100644
--- a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt
+++ b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qmutex Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qmutex
+qt_internal_add_benchmark(tst_bench_qmutex
     SOURCES
         tst_qmutex.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt
index 228f589e08..79d3a2f879 100644
--- a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt
+++ b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qreadwritelock Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qreadwritelock
+qt_internal_add_benchmark(tst_bench_qreadwritelock
     SOURCES
         tst_qreadwritelock.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt
index fef77ff03c..7b0c81891e 100644
--- a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt
+++ b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qthreadpool Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qthreadpool
+qt_internal_add_benchmark(tst_bench_qthreadpool
     SOURCES
         tst_qthreadpool.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt
index 45e8c92c38..78ac072d35 100644
--- a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt
+++ b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qthreadstorage Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qthreadstorage
+qt_internal_add_benchmark(tst_bench_qthreadstorage
     SOURCES
         tst_qthreadstorage.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
index d686746e58..68c6e88342 100644
--- a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
+++ b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qwaitcondition Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qwaitcondition
+qt_internal_add_benchmark(tst_bench_qwaitcondition
     SOURCES
         tst_qwaitcondition.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt
index 2a70ef5f4f..edc55463d8 100644
--- a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt
+++ b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qdate Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qdate
+qt_internal_add_benchmark(tst_bench_qdate
     SOURCES
         tst_bench_qdate.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt
index 6abe0035c7..2585b0d25d 100644
--- a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt
+++ b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qdatetime Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qdatetime
+qt_internal_add_benchmark(tst_bench_qdatetime
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt
index b4836337bc..c6487499af 100644
--- a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt
+++ b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qtimezone Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qtimezone
+qt_internal_add_benchmark(tst_bench_qtimezone
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt
index d07794c25e..1e653fa98d 100644
--- a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_containers-associative Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_containers-associative
+qt_internal_add_benchmark(tst_bench_containers-associative
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt
index 77e889160c..f8ebc69c29 100644
--- a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_containers-sequential Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_containers-sequential
+qt_internal_add_benchmark(tst_bench_containers-sequential
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt b/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt
deleted file mode 100644
index c51e2a0059..0000000000
--- a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_qt_test(tst_bench_qchar SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt
index 8d4bff5979..e683d60de2 100644
--- a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qcontiguouscache Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qcontiguouscache
+qt_internal_add_benchmark(tst_bench_qcontiguouscache
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt
index 77168e443b..2ca8e683e1 100644
--- a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qcryptographichash Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qcryptographichash
+qt_internal_add_benchmark(tst_bench_qcryptographichash
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt
deleted file mode 100644
index 6875fdd613..0000000000
--- a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_qt_test(tst_bench_qdatetime SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt
index 760b1848d7..5286484b0c 100644
--- a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_hash Binary:
 #####################################################################
 
-qt_add_benchmark(tst_hash
+qt_internal_add_benchmark(tst_hash
     SOURCES
         main.cpp
         outofline.cpp
diff --git a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt
index 40be9e9374..46ca1c8514 100644
--- a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qlist Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qlist
+qt_internal_add_benchmark(tst_bench_qlist
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt
deleted file mode 100644
index b8a23bc757..0000000000
--- a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_qt_test(tst_bench_qlocale SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt
index b814b018c0..5937eda37c 100644
--- a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qmap Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qmap
+qt_internal_add_benchmark(tst_bench_qmap
     SOURCES
         main.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt
index fd9ea5a6f2..30234c7055 100644
--- a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qrect Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qrect
+qt_internal_add_benchmark(tst_bench_qrect
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt
index fd10411ff3..63128f5f95 100644
--- a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_qringbuffer Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qringbuffer
+qt_internal_add_benchmark(tst_bench_qringbuffer
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt
index 9627338414..00fd088776 100644
--- a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qset Binary:
 #####################################################################
 
-qt_add_benchmark(tst_qset
+qt_internal_add_benchmark(tst_qset
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt
index 2389dd51ce..4526af60db 100644
--- a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_stack Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_stack
+qt_internal_add_benchmark(tst_bench_stack
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt
deleted file mode 100644
index 1dd6678e8e..0000000000
--- a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_qt_test(tst_bench_qstring SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt
deleted file mode 100644
index 3947ae1c5e..0000000000
--- a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_qt_test(tst_bench_qtimezone SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt
index ae40297604..467405eea0 100644
--- a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt
+++ b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_bench_vector Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_vector
+qt_internal_add_benchmark(tst_bench_vector
     SOURCES
         main.cpp
         outofline.cpp