From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 22 Sep 2020 10:16:58 +0200
Subject: 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>
---
 tests/auto/testlib/selftests/CMakeLists.txt                       | 8 ++++----
 tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt          | 2 +-
 tests/auto/testlib/selftests/assert/CMakeLists.txt                | 4 ++--
 tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt          | 2 +-
 tests/auto/testlib/selftests/badxml/CMakeLists.txt                | 4 ++--
 .../auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt | 2 +-
 tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt     | 4 ++--
 .../auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt  | 2 +-
 tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt      | 4 ++--
 .../testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt   | 2 +-
 tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt  | 4 ++--
 tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt | 2 +-
 tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt       | 4 ++--
 .../testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt    | 2 +-
 tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt   | 4 ++--
 .../auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt  | 2 +-
 tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt      | 4 ++--
 tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt     | 2 +-
 tests/auto/testlib/selftests/blacklisted/CMakeLists.txt           | 4 ++--
 tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt         | 4 ++--
 tests/auto/testlib/selftests/cmptest/CMakeLists.txt               | 6 +++---
 tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt | 2 +-
 tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt       | 4 ++--
 tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/counting/CMakeLists.txt              | 4 ++--
 tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt         | 2 +-
 tests/auto/testlib/selftests/crashes/CMakeLists.txt               | 4 ++--
 tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt       | 2 +-
 tests/auto/testlib/selftests/datatable/CMakeLists.txt             | 4 ++--
 tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/datetime/CMakeLists.txt              | 4 ++--
 tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt     | 2 +-
 tests/auto/testlib/selftests/deleteLater/CMakeLists.txt           | 4 ++--
 .../auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt | 2 +-
 tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt     | 4 ++--
 tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt   | 2 +-
 tests/auto/testlib/selftests/differentexec/CMakeLists.txt         | 4 ++--
 tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt  | 2 +-
 tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt        | 4 ++--
 tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt      | 2 +-
 tests/auto/testlib/selftests/expectfail/CMakeLists.txt            | 4 ++--
 tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt     | 2 +-
 tests/auto/testlib/selftests/failcleanup/CMakeLists.txt           | 4 ++--
 tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt    | 2 +-
 tests/auto/testlib/selftests/faildatatype/CMakeLists.txt          | 4 ++--
 tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt   | 2 +-
 tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt         | 4 ++--
 tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/failinit/CMakeLists.txt              | 4 ++--
 tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt    | 2 +-
 tests/auto/testlib/selftests/failinitdata/CMakeLists.txt          | 4 ++--
 tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt      | 2 +-
 tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt            | 4 ++--
 tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt    | 4 ++--
 tests/auto/testlib/selftests/findtestdata/CMakeLists.txt          | 6 +++---
 tests/auto/testlib/selftests/float/.prev_CMakeLists.txt           | 2 +-
 tests/auto/testlib/selftests/float/CMakeLists.txt                 | 4 ++--
 tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt      | 2 +-
 tests/auto/testlib/selftests/globaldata/CMakeLists.txt            | 4 ++--
 tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/keyboard/CMakeLists.txt              | 4 ++--
 tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt      | 2 +-
 tests/auto/testlib/selftests/longstring/CMakeLists.txt            | 4 ++--
 tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt     | 2 +-
 tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt           | 4 ++--
 tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt           | 2 +-
 tests/auto/testlib/selftests/mouse/CMakeLists.txt                 | 4 ++--
 tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt       | 2 +-
 tests/auto/testlib/selftests/multiexec/CMakeLists.txt             | 4 ++--
 tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt | 2 +-
 tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt       | 4 ++--
 tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt            | 2 +-
 tests/auto/testlib/selftests/pass/CMakeLists.txt                  | 4 ++--
 tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt   | 2 +-
 tests/auto/testlib/selftests/printdatatags/CMakeLists.txt         | 4 ++--
 .../selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt    | 2 +-
 .../testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt  | 4 ++--
 tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt | 2 +-
 tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt       | 4 ++--
 tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt    | 2 +-
 tests/auto/testlib/selftests/signaldumper/CMakeLists.txt          | 4 ++--
 tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt          | 2 +-
 tests/auto/testlib/selftests/silent/CMakeLists.txt                | 4 ++--
 tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt      | 2 +-
 tests/auto/testlib/selftests/singleskip/CMakeLists.txt            | 4 ++--
 tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt            | 2 +-
 tests/auto/testlib/selftests/skip/CMakeLists.txt                  | 4 ++--
 tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt     | 2 +-
 tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt           | 4 ++--
 tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/skipinit/CMakeLists.txt              | 4 ++--
 tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt    | 2 +-
 tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt          | 4 ++--
 tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt           | 2 +-
 tests/auto/testlib/selftests/sleep/CMakeLists.txt                 | 4 ++--
 tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt          | 2 +-
 tests/auto/testlib/selftests/strcmp/CMakeLists.txt                | 4 ++--
 tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt         | 2 +-
 tests/auto/testlib/selftests/subtest/CMakeLists.txt               | 4 ++--
 tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt         | 2 +-
 tests/auto/testlib/selftests/testlib/CMakeLists.txt               | 4 ++--
 .../auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt  | 2 +-
 tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt      | 4 ++--
 tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/verbose1/CMakeLists.txt              | 4 ++--
 tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/verbose2/CMakeLists.txt              | 4 ++--
 .../testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt  | 2 +-
 tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt | 4 ++--
 tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/warnings/CMakeLists.txt              | 4 ++--
 tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt        | 2 +-
 tests/auto/testlib/selftests/watchdog/CMakeLists.txt              | 4 ++--
 tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt           | 2 +-
 tests/auto/testlib/selftests/xunit/CMakeLists.txt                 | 4 ++--
 115 files changed, 179 insertions(+), 179 deletions(-)

(limited to 'tests/auto/testlib/selftests')

diff --git a/tests/auto/testlib/selftests/CMakeLists.txt b/tests/auto/testlib/selftests/CMakeLists.txt
index 7445776561..7a352740da 100644
--- a/tests/auto/testlib/selftests/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/CMakeLists.txt
@@ -5,7 +5,7 @@ include(../../../../src/testlib/selfcover.cmake)
 
 # ------------- Test runner -------------
 
-qt_add_test(tst_selftests
+qt_internal_add_test(tst_selftests
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     EXCEPTIONS
     CATCH
@@ -40,7 +40,7 @@ set(qmake_expected_files_resource_files
     ${resource_glob_0}
 )
 
-qt_add_resource(tst_selftests "qmake_expected_files"
+qt_internal_add_resource(tst_selftests "qmake_expected_files"
     PREFIX
         "/"
     BASE
@@ -59,7 +59,7 @@ qt_add_resource(tst_selftests "qmake_expected_files"
 #### Keys ignored in scope 7:.:..:../selftests.pri:TARGET Qt::Gui:
 # SUBPROGRAMS = "keyboard" "mouse"
 
-qt_apply_testlib_coverage_options(tst_selftests)
+qt_internal_apply_testlib_coverage_options(tst_selftests)
 
 # ------------- Sub tests -------------
 
@@ -134,7 +134,7 @@ foreach(subprogram IN LISTS subprograms)
 endforeach()
 
 list(JOIN subprograms " " subprograms)
-qt_extend_target(tst_selftests
+qt_internal_extend_target(tst_selftests
     DEFINES
         SUBPROGRAMS=${subprograms}
 )
diff --git a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
index 765750bb71..db726c1a2d 100644
--- a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## assert Binary:
 #####################################################################
 
-qt_add_executable(assert
+qt_internal_add_executable(assert
     SOURCES
         tst_assert.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/assert/CMakeLists.txt b/tests/auto/testlib/selftests/assert/CMakeLists.txt
index 56a1b33bb4..07f1dd6825 100644
--- a/tests/auto/testlib/selftests/assert/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/assert/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## assert Binary:
 #####################################################################
 
-qt_add_executable(assert
+qt_internal_add_executable(assert
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(assert
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(assert)
+qt_internal_apply_testlib_coverage_options(assert)
 # special case end
diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
index 78ae572e03..a085cd97e4 100644
--- a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## badxml Binary:
 #####################################################################
 
-qt_add_executable(badxml
+qt_internal_add_executable(badxml
     SOURCES
         tst_badxml.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/badxml/CMakeLists.txt b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
index 8535ceb3cd..733d826f97 100644
--- a/tests/auto/testlib/selftests/badxml/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## badxml Binary:
 #####################################################################
 
-qt_add_executable(badxml
+qt_internal_add_executable(badxml
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -18,5 +18,5 @@ qt_add_executable(badxml
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(badxml)
+qt_internal_apply_testlib_coverage_options(badxml)
 # special case end
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
index 0dca3616e1..54922d5246 100644
--- a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibcallgrind Binary:
 #####################################################################
 
-qt_add_executable(benchlibcallgrind
+qt_internal_add_executable(benchlibcallgrind
     SOURCES
         tst_benchlibcallgrind.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
index f86bb4ae05..3dfc0d7916 100644
--- a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibcallgrind Binary:
 #####################################################################
 
-qt_add_executable(benchlibcallgrind
+qt_internal_add_executable(benchlibcallgrind
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(benchlibcallgrind
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(benchlibcallgrind)
+qt_internal_apply_testlib_coverage_options(benchlibcallgrind)
 # special case end
diff --git a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
index 69ecc99b51..9f60f10bec 100644
--- a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibcounting Binary:
 #####################################################################
 
-qt_add_executable(benchlibcounting
+qt_internal_add_executable(benchlibcounting
     SOURCES
         tst_benchlibcounting.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
index 39d5a6e721..efc813bb27 100644
--- a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibcounting Binary:
 #####################################################################
 
-qt_add_executable(benchlibcounting
+qt_internal_add_executable(benchlibcounting
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(benchlibcounting
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(tst_selftests)
+qt_internal_apply_testlib_coverage_options(tst_selftests)
 # special case end
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
index e61fc6f93e..2fe5b21a9a 100644
--- a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibeventcounter Binary:
 #####################################################################
 
-qt_add_executable(benchlibeventcounter
+qt_internal_add_executable(benchlibeventcounter
     SOURCES
         tst_benchlibeventcounter.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
index 0b626def35..0c9c5fdc32 100644
--- a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibeventcounter Binary:
 #####################################################################
 
-qt_add_executable(benchlibeventcounter
+qt_internal_add_executable(benchlibeventcounter
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(benchlibeventcounter
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(benchlibeventcounter)
+qt_internal_apply_testlib_coverage_options(benchlibeventcounter)
 # special case end
diff --git a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
index 73c72a5621..22ad02f2d8 100644
--- a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchliboptions Binary:
 #####################################################################
 
-qt_add_executable(benchliboptions
+qt_internal_add_executable(benchliboptions
     SOURCES
         tst_benchliboptions.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
index fdb8218406..94ee9dd501 100644
--- a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchliboptions Binary:
 #####################################################################
 
-qt_add_executable(benchliboptions
+qt_internal_add_executable(benchliboptions
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(benchliboptions
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(tst_selftests)
+qt_internal_apply_testlib_coverage_options(tst_selftests)
 # special case end
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
index 10696754dc..e2f83a540c 100644
--- a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibtickcounter Binary:
 #####################################################################
 
-qt_add_executable(benchlibtickcounter
+qt_internal_add_executable(benchlibtickcounter
     SOURCES
         tst_benchlibtickcounter.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
index 9c689584f8..463a74eaf7 100644
--- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibtickcounter Binary:
 #####################################################################
 
-qt_add_executable(benchlibtickcounter
+qt_internal_add_executable(benchlibtickcounter
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(benchlibtickcounter
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(benchlibtickcounter)
+qt_internal_apply_testlib_coverage_options(benchlibtickcounter)
 # special case end
diff --git a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
index 372dfe014f..e2a724d1d9 100644
--- a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibwalltime Binary:
 #####################################################################
 
-qt_add_executable(benchlibwalltime
+qt_internal_add_executable(benchlibwalltime
     SOURCES
         tst_benchlibwalltime.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
index 3266361433..830e415440 100644
--- a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibwalltime Binary:
 #####################################################################
 
-qt_add_executable(benchlibwalltime
+qt_internal_add_executable(benchlibwalltime
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(benchlibwalltime
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(benchlibwalltime)
+qt_internal_apply_testlib_coverage_options(benchlibwalltime)
 # special case end
diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
index 5083fe8a52..573da14d3f 100644
--- a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## blacklisted Binary:
 #####################################################################
 
-qt_add_executable(blacklisted
+qt_internal_add_executable(blacklisted
     SOURCES
         tst_blacklisted.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
index 3b924c12bc..87caa5770c 100644
--- a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## blacklisted Binary:
 #####################################################################
 
-qt_add_executable(blacklisted
+qt_internal_add_executable(blacklisted
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(blacklisted
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(blacklisted)
+qt_internal_apply_testlib_coverage_options(blacklisted)
 # special case end
diff --git a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
index abc5f9b023..c9732fac81 100644
--- a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cmptest Binary:
 #####################################################################
 
-qt_add_executable(cmptest
+qt_internal_add_executable(cmptest
     SOURCES
         tst_cmptest.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ qt_add_executable(cmptest
 ## Scopes:
 #####################################################################
 
-qt_extend_target(cmptest CONDITION TARGET Qt::Gui
+qt_internal_extend_target(cmptest CONDITION TARGET Qt::Gui
     PUBLIC_LIBRARIES
         Qt::Gui
 )
diff --git a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
index 336fb01e74..b5522fe4bb 100644
--- a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cmptest Binary:
 #####################################################################
 
-qt_add_executable(cmptest
+qt_internal_add_executable(cmptest
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -16,11 +16,11 @@ qt_add_executable(cmptest
 ## Scopes:
 #####################################################################
 
-qt_extend_target(cmptest CONDITION TARGET Qt::Gui
+qt_internal_extend_target(cmptest CONDITION TARGET Qt::Gui
     PUBLIC_LIBRARIES
         Qt::Gui
 )
 
 # special case begin
-qt_apply_testlib_coverage_options(cmptest)
+qt_internal_apply_testlib_coverage_options(cmptest)
 # special case end
diff --git a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
index 2f08f35c03..fe0986edf6 100644
--- a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## commandlinedata Binary:
 #####################################################################
 
-qt_add_executable(commandlinedata
+qt_internal_add_executable(commandlinedata
     SOURCES
         tst_commandlinedata.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
index 889ef5377f..ce5847db93 100644
--- a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## commandlinedata Binary:
 #####################################################################
 
-qt_add_executable(commandlinedata
+qt_internal_add_executable(commandlinedata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(commandlinedata
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(commandlinedata)
+qt_internal_apply_testlib_coverage_options(commandlinedata)
 # special case end
diff --git a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
index 88b5ffb603..c61b30d4fa 100644
--- a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## counting Binary:
 #####################################################################
 
-qt_add_executable(counting
+qt_internal_add_executable(counting
     SOURCES
         tst_counting.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/counting/CMakeLists.txt b/tests/auto/testlib/selftests/counting/CMakeLists.txt
index 1a7af9ba4f..bbcd3543d1 100644
--- a/tests/auto/testlib/selftests/counting/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/counting/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## counting Binary:
 #####################################################################
 
-qt_add_executable(counting
+qt_internal_add_executable(counting
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(counting
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(counting)
+qt_internal_apply_testlib_coverage_options(counting)
 # special case end
diff --git a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
index eb1e941c5c..e6ace5f85b 100644
--- a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## crashes Binary:
 #####################################################################
 
-qt_add_executable(crashes
+qt_internal_add_executable(crashes
     SOURCES
         tst_crashes.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/crashes/CMakeLists.txt b/tests/auto/testlib/selftests/crashes/CMakeLists.txt
index 6e340067ec..c09049a933 100644
--- a/tests/auto/testlib/selftests/crashes/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/crashes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## crashes Binary:
 #####################################################################
 
-qt_add_executable(crashes
+qt_internal_add_executable(crashes
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(crashes
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(crashes)
+qt_internal_apply_testlib_coverage_options(crashes)
 # special case end
diff --git a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
index c7e2532c47..638afbd980 100644
--- a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## datatable Binary:
 #####################################################################
 
-qt_add_executable(datatable
+qt_internal_add_executable(datatable
     SOURCES
         tst_datatable.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/datatable/CMakeLists.txt b/tests/auto/testlib/selftests/datatable/CMakeLists.txt
index 8d7abc7fbf..66bfa4a208 100644
--- a/tests/auto/testlib/selftests/datatable/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datatable/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## datatable Binary:
 #####################################################################
 
-qt_add_executable(datatable
+qt_internal_add_executable(datatable
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(datatable
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(datatable)
+qt_internal_apply_testlib_coverage_options(datatable)
 # special case end
diff --git a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
index eb0040c218..2d50d2cea2 100644
--- a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## datetime Binary:
 #####################################################################
 
-qt_add_executable(datetime
+qt_internal_add_executable(datetime
     SOURCES
         tst_datetime.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/datetime/CMakeLists.txt b/tests/auto/testlib/selftests/datetime/CMakeLists.txt
index ade9978801..5a3df8085d 100644
--- a/tests/auto/testlib/selftests/datetime/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datetime/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## datetime Binary:
 #####################################################################
 
-qt_add_executable(datetime
+qt_internal_add_executable(datetime
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(datetime
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(datetime)
+qt_internal_apply_testlib_coverage_options(datetime)
 # special case end
diff --git a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
index 0b41340fdc..20eabfd0a0 100644
--- a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## deleteLater Binary:
 #####################################################################
 
-qt_add_executable(deleteLater
+qt_internal_add_executable(deleteLater
     SOURCES
         tst_deleteLater.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
index 8ba9a7ed2b..ca42199665 100644
--- a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## deleteLater Binary:
 #####################################################################
 
-qt_add_executable(deleteLater
+qt_internal_add_executable(deleteLater
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -14,5 +14,5 @@ qt_add_executable(deleteLater
 )
 
 # special case begin
-qt_apply_testlib_coverage_options(deleteLater)
+qt_internal_apply_testlib_coverage_options(deleteLater)
 # special case end
diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
index 88bb80bd67..9247c8c5f3 100644
--- a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## deleteLater_noApp Binary:
 #####################################################################
 
-qt_add_executable(deleteLater_noApp
+qt_internal_add_executable(deleteLater_noApp
     SOURCES
         tst_deleteLater_noApp.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt
index f681aafc35..0ebdc89cb8 100644
--- a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## deleteLater_noApp Binary:
 #####################################################################
 
-qt_add_executable(deleteLater_noApp
+qt_internal_add_executable(deleteLater_noApp
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -14,5 +14,5 @@ qt_add_executable(deleteLater_noApp
 )
 
 # special case begin
-qt_apply_testlib_coverage_options(deleteLater_noApp)
+qt_internal_apply_testlib_coverage_options(deleteLater_noApp)
 # special case end
diff --git a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
index 69e37e0699..65498104e7 100644
--- a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentexec Binary:
 #####################################################################
 
-qt_add_executable(differentexec
+qt_internal_add_executable(differentexec
     SOURCES
         tst_differentexec.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
index 45e0a948fd..e13817f1e1 100644
--- a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentexec Binary:
 #####################################################################
 
-qt_add_executable(differentexec
+qt_internal_add_executable(differentexec
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(differentexec
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(differentexec)
+qt_internal_apply_testlib_coverage_options(differentexec)
 # special case end
diff --git a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
index db2c576930..0b9037d20b 100644
--- a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## exceptionthrow Binary:
 #####################################################################
 
-qt_add_executable(exceptionthrow
+qt_internal_add_executable(exceptionthrow
     EXCEPTIONS
     SOURCES
         tst_exceptionthrow.cpp
diff --git a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
index 33ecfe585c..ba793db66c 100644
--- a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## exceptionthrow Binary:
 #####################################################################
 
-qt_add_executable(exceptionthrow
+qt_internal_add_executable(exceptionthrow
     EXCEPTIONS
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
@@ -18,5 +18,5 @@ qt_add_executable(exceptionthrow
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(exceptionthrow)
+qt_internal_apply_testlib_coverage_options(exceptionthrow)
 # special case end
diff --git a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
index faa09bbc6c..4605e6848e 100644
--- a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## expectfail Binary:
 #####################################################################
 
-qt_add_executable(expectfail
+qt_internal_add_executable(expectfail
     SOURCES
         tst_expectfail.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
index a7b072cfd3..84aa93d1ca 100644
--- a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## expectfail Binary:
 #####################################################################
 
-qt_add_executable(expectfail
+qt_internal_add_executable(expectfail
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(expectfail
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(expectfail)
+qt_internal_apply_testlib_coverage_options(expectfail)
 # special case end
diff --git a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
index 6a8238af81..db4ab2a82a 100644
--- a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failcleanup Binary:
 #####################################################################
 
-qt_add_executable(failcleanup
+qt_internal_add_executable(failcleanup
     SOURCES
         tst_failcleanup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
index fc02ec1fed..e45d1b528b 100644
--- a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failcleanup Binary:
 #####################################################################
 
-qt_add_executable(failcleanup
+qt_internal_add_executable(failcleanup
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(failcleanup
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(failcleanup)
+qt_internal_apply_testlib_coverage_options(failcleanup)
 # special case end
diff --git a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
index 2c67f1d445..e333ba128c 100644
--- a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## faildatatype Binary:
 #####################################################################
 
-qt_add_executable(faildatatype
+qt_internal_add_executable(faildatatype
     SOURCES
         tst_faildatatype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
index 45c8e46777..0abba3e021 100644
--- a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## faildatatype Binary:
 #####################################################################
 
-qt_add_executable(faildatatype
+qt_internal_add_executable(faildatatype
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(faildatatype
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(faildatatype)
+qt_internal_apply_testlib_coverage_options(faildatatype)
 # special case end
diff --git a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
index 0323acd635..daf2ac1a27 100644
--- a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failfetchtype Binary:
 #####################################################################
 
-qt_add_executable(failfetchtype
+qt_internal_add_executable(failfetchtype
     SOURCES
         tst_failfetchtype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
index 7f02dac54b..0ce60f591e 100644
--- a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failfetchtype Binary:
 #####################################################################
 
-qt_add_executable(failfetchtype
+qt_internal_add_executable(failfetchtype
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(failfetchtype
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(failfetchtype)
+qt_internal_apply_testlib_coverage_options(failfetchtype)
 # special case end
diff --git a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
index 42909ca3c5..9b56b8bf89 100644
--- a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failinit Binary:
 #####################################################################
 
-qt_add_executable(failinit
+qt_internal_add_executable(failinit
     SOURCES
         tst_failinit.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/failinit/CMakeLists.txt b/tests/auto/testlib/selftests/failinit/CMakeLists.txt
index 8ad3130c3c..b6995e591d 100644
--- a/tests/auto/testlib/selftests/failinit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failinit Binary:
 #####################################################################
 
-qt_add_executable(failinit
+qt_internal_add_executable(failinit
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(failinit
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(failinit)
+qt_internal_apply_testlib_coverage_options(failinit)
 # special case end
diff --git a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
index 4ae38831a1..31a244fabb 100644
--- a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failinitdata Binary:
 #####################################################################
 
-qt_add_executable(failinitdata
+qt_internal_add_executable(failinitdata
     SOURCES
         tst_failinitdata.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
index 2679d2eed5..dcc2bdafde 100644
--- a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failinitdata Binary:
 #####################################################################
 
-qt_add_executable(failinitdata
+qt_internal_add_executable(failinitdata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(failinitdata
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(failinitdata)
+qt_internal_apply_testlib_coverage_options(failinitdata)
 # special case end
diff --git a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
index 76fee4606d..e00655cefb 100644
--- a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## fetchbogus Binary:
 #####################################################################
 
-qt_add_executable(fetchbogus
+qt_internal_add_executable(fetchbogus
     SOURCES
         tst_fetchbogus.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
index 7ad4fe65ae..1f5f5cedf0 100644
--- a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## fetchbogus Binary:
 #####################################################################
 
-qt_add_executable(fetchbogus
+qt_internal_add_executable(fetchbogus
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(fetchbogus
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(fetchbogus)
+qt_internal_apply_testlib_coverage_options(fetchbogus)
 # special case end
diff --git a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
index 768abb6824..075f2830d3 100644
--- a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## findtestdata Binary:
 #####################################################################
 
-qt_add_executable(findtestdata
+qt_internal_add_executable(findtestdata
     SOURCES
         findtestdata.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(findtestdata_resource_files
     "qt.conf"
 )
 
-qt_add_resource(findtestdata "findtestdata"
+qt_internal_add_resource(findtestdata "findtestdata"
     PREFIX
         "/qt/etc/"
     FILES
diff --git a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
index 2a3302fb3e..9c06a09c18 100644
--- a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## findtestdata Binary:
 #####################################################################
 
-qt_add_executable(findtestdata
+qt_internal_add_executable(findtestdata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -18,7 +18,7 @@ set(findtestdata_resource_files
     "qt.conf"
 )
 
-qt_add_resource(findtestdata "findtestdata"
+qt_internal_add_resource(findtestdata "findtestdata"
     PREFIX
         "/qt/etc/"
     FILES
@@ -30,5 +30,5 @@ qt_add_resource(findtestdata "findtestdata"
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(findtestdata)
+qt_internal_apply_testlib_coverage_options(findtestdata)
 # special case end
diff --git a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
index 8b47df4c03..4390a9122d 100644
--- a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## float Binary:
 #####################################################################
 
-qt_add_executable(float
+qt_internal_add_executable(float
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_float.cpp
diff --git a/tests/auto/testlib/selftests/float/CMakeLists.txt b/tests/auto/testlib/selftests/float/CMakeLists.txt
index 2eb3264acd..375cfe1e65 100644
--- a/tests/auto/testlib/selftests/float/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/float/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## float Binary:
 #####################################################################
 
-qt_add_executable(float
+qt_internal_add_executable(float
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -20,5 +20,5 @@ qt_add_executable(float
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(float)
+qt_internal_apply_testlib_coverage_options(float)
 # special case end
diff --git a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
index 0ad5394732..6bbff782c6 100644
--- a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## globaldata Binary:
 #####################################################################
 
-qt_add_executable(globaldata
+qt_internal_add_executable(globaldata
     SOURCES
         tst_globaldata.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
index a2035f4bcf..0793b6c4e3 100644
--- a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## globaldata Binary:
 #####################################################################
 
-qt_add_executable(globaldata
+qt_internal_add_executable(globaldata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(globaldata
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(globaldata)
+qt_internal_apply_testlib_coverage_options(globaldata)
 # special case end
diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
index 3eb954cfa6..2300f2475e 100644
--- a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## keyboard Binary:
 #####################################################################
 
-qt_add_executable(keyboard
+qt_internal_add_executable(keyboard
     SOURCES
         tst_keyboard.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
index 120cf1f82c..998de7f0ed 100644
--- a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## keyboard Binary:
 #####################################################################
 
-qt_add_executable(keyboard
+qt_internal_add_executable(keyboard
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -20,5 +20,5 @@ qt_add_executable(keyboard
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(keyboard)
+qt_internal_apply_testlib_coverage_options(keyboard)
 # special case end
diff --git a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
index f2757e9760..c1c09fecca 100644
--- a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## longstring Binary:
 #####################################################################
 
-qt_add_executable(longstring
+qt_internal_add_executable(longstring
     SOURCES
         tst_longstring.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/longstring/CMakeLists.txt b/tests/auto/testlib/selftests/longstring/CMakeLists.txt
index 66554f871e..1b123b1e0c 100644
--- a/tests/auto/testlib/selftests/longstring/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/longstring/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## longstring Binary:
 #####################################################################
 
-qt_add_executable(longstring
+qt_internal_add_executable(longstring
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(longstring
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(longstring)
+qt_internal_apply_testlib_coverage_options(longstring)
 # special case end
diff --git a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
index a0d3f9f1e0..82063c3d2f 100644
--- a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## maxwarnings Binary:
 #####################################################################
 
-qt_add_executable(maxwarnings
+qt_internal_add_executable(maxwarnings
     SOURCES
         maxwarnings.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
index 25c40909de..6c2eca0935 100644
--- a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## maxwarnings Binary:
 #####################################################################
 
-qt_add_executable(maxwarnings
+qt_internal_add_executable(maxwarnings
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(maxwarnings
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(maxwarnings)
+qt_internal_apply_testlib_coverage_options(maxwarnings)
 # special case end
diff --git a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
index 88749cbd57..7e7a3a7dff 100644
--- a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mouse Binary:
 #####################################################################
 
-qt_add_executable(mouse
+qt_internal_add_executable(mouse
     SOURCES
         tst_mouse.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/mouse/CMakeLists.txt b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
index 3059947fe2..aab32b06ba 100644
--- a/tests/auto/testlib/selftests/mouse/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mouse Binary:
 #####################################################################
 
-qt_add_executable(mouse
+qt_internal_add_executable(mouse
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -20,5 +20,5 @@ qt_add_executable(mouse
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(mouse)
+qt_internal_apply_testlib_coverage_options(mouse)
 # special case end
diff --git a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
index 746399f451..8b92a505d0 100644
--- a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiexec Binary:
 #####################################################################
 
-qt_add_executable(multiexec
+qt_internal_add_executable(multiexec
     SOURCES
         tst_multiexec.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
index 5ccd011975..314765b803 100644
--- a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiexec Binary:
 #####################################################################
 
-qt_add_executable(multiexec
+qt_internal_add_executable(multiexec
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(multiexec
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(multiexec)
+qt_internal_apply_testlib_coverage_options(multiexec)
 # special case end
diff --git a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
index 30ca138997..3015e9a014 100644
--- a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pairdiagnostics Binary:
 #####################################################################
 
-qt_add_executable(pairdiagnostics
+qt_internal_add_executable(pairdiagnostics
     SOURCES
         tst_pairdiagnostics.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
index ce5faf810b..f752131325 100644
--- a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pairdiagnostics Binary:
 #####################################################################
 
-qt_add_executable(pairdiagnostics
+qt_internal_add_executable(pairdiagnostics
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -14,5 +14,5 @@ qt_add_executable(pairdiagnostics
 )
 
 # special case begin
-qt_apply_testlib_coverage_options(pairdiagnostics)
+qt_internal_apply_testlib_coverage_options(pairdiagnostics)
 # special case end
diff --git a/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt
index c65690e7e0..123a978b96 100644
--- a/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pass Binary:
 #####################################################################
 
-qt_add_executable(pass
+qt_internal_add_executable(pass
     SOURCES
         tst_pass.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/pass/CMakeLists.txt b/tests/auto/testlib/selftests/pass/CMakeLists.txt
index 424201c5c8..1f54a009ec 100644
--- a/tests/auto/testlib/selftests/pass/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/pass/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pass Binary:
 #####################################################################
 
-qt_add_executable(pass
+qt_internal_add_executable(pass
     NO_INSTALL # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" # special case
     SOURCES
@@ -17,6 +17,6 @@ qt_add_executable(pass
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(pass)
+qt_internal_apply_testlib_coverage_options(pass)
 # special case end
 
diff --git a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
index 174a6faf7c..efff1b908c 100644
--- a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## printdatatags Binary:
 #####################################################################
 
-qt_add_executable(printdatatags
+qt_internal_add_executable(printdatatags
     SOURCES
         tst_printdatatags.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
index 7ab050857f..a323b1f73d 100644
--- a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## printdatatags Binary:
 #####################################################################
 
-qt_add_executable(printdatatags
+qt_internal_add_executable(printdatatags
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(printdatatags
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(printdatatags)
+qt_internal_apply_testlib_coverage_options(printdatatags)
 # special case end
diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
index 0922d380d3..0b60f71967 100644
--- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## printdatatagswithglobaltags Binary:
 #####################################################################
 
-qt_add_executable(printdatatagswithglobaltags
+qt_internal_add_executable(printdatatagswithglobaltags
     SOURCES
         tst_printdatatagswithglobaltags.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
index 9d9edf1fae..323d3d65ed 100644
--- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## printdatatagswithglobaltags Binary:
 #####################################################################
 
-qt_add_executable(printdatatagswithglobaltags
+qt_internal_add_executable(printdatatagswithglobaltags
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(printdatatagswithglobaltags
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(printdatatagswithglobaltags)
+qt_internal_apply_testlib_coverage_options(printdatatagswithglobaltags)
 # special case end
diff --git a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
index 50cf4d8473..4c3d57c0b2 100644
--- a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qexecstringlist Binary:
 #####################################################################
 
-qt_add_executable(qexecstringlist
+qt_internal_add_executable(qexecstringlist
     SOURCES
         tst_qexecstringlist.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
index 22ad5b7911..2aec291154 100644
--- a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qexecstringlist Binary:
 #####################################################################
 
-qt_add_executable(qexecstringlist
+qt_internal_add_executable(qexecstringlist
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(qexecstringlist
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(qexecstringlist)
+qt_internal_apply_testlib_coverage_options(qexecstringlist)
 # special case end
diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
index e0f9e38293..ae410890c4 100644
--- a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## signaldumper Binary:
 #####################################################################
 
-qt_add_executable(signaldumper
+qt_internal_add_executable(signaldumper
     SOURCES
         tst_signaldumper.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
index 67ae4e690a..a8c667d721 100644
--- a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## signaldumper Binary:
 #####################################################################
 
-qt_add_executable(signaldumper
+qt_internal_add_executable(signaldumper
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(signaldumper
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(signaldumper)
+qt_internal_apply_testlib_coverage_options(signaldumper)
 # special case end
diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
index 205586621a..4b491af803 100644
--- a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## silent Binary:
 #####################################################################
 
-qt_add_executable(silent
+qt_internal_add_executable(silent
     SOURCES
         tst_silent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt
index 873e7e1fe9..d029aa8021 100644
--- a/tests/auto/testlib/selftests/silent/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## silent Binary:
 #####################################################################
 
-qt_add_executable(silent
+qt_internal_add_executable(silent
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(silent
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(silent)
+qt_internal_apply_testlib_coverage_options(silent)
 # special case end
diff --git a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
index 8813e9a759..2113efbec4 100644
--- a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## singleskip Binary:
 #####################################################################
 
-qt_add_executable(singleskip
+qt_internal_add_executable(singleskip
     SOURCES
         tst_singleskip.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
index 158c8dd094..fa8132a3c1 100644
--- a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## singleskip Binary:
 #####################################################################
 
-qt_add_executable(singleskip
+qt_internal_add_executable(singleskip
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(singleskip
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(singleskip)
+qt_internal_apply_testlib_coverage_options(singleskip)
 # special case end
diff --git a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
index 74d7e19cf3..c93194854a 100644
--- a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skip Binary:
 #####################################################################
 
-qt_add_executable(skip
+qt_internal_add_executable(skip
     SOURCES
         tst_skip.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/skip/CMakeLists.txt b/tests/auto/testlib/selftests/skip/CMakeLists.txt
index 5b7e35e4ce..2841dcbd9a 100644
--- a/tests/auto/testlib/selftests/skip/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skip/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skip Binary:
 #####################################################################
 
-qt_add_executable(skip
+qt_internal_add_executable(skip
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(skip
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(skip)
+qt_internal_apply_testlib_coverage_options(skip)
 # special case end
diff --git a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
index fba23174bd..ee3e887345 100644
--- a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipcleanup Binary:
 #####################################################################
 
-qt_add_executable(skipcleanup
+qt_internal_add_executable(skipcleanup
     SOURCES
         tst_skipcleanup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
index fd64c94d9e..5af361e25a 100644
--- a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipcleanup Binary:
 #####################################################################
 
-qt_add_executable(skipcleanup
+qt_internal_add_executable(skipcleanup
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(skipcleanup
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(skipcleanup)
+qt_internal_apply_testlib_coverage_options(skipcleanup)
 # special case end
diff --git a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
index c9af8b4a2c..abb3dba808 100644
--- a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipinit Binary:
 #####################################################################
 
-qt_add_executable(skipinit
+qt_internal_add_executable(skipinit
     SOURCES
         tst_skipinit.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
index 564b1cc8a3..6cf2e97688 100644
--- a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipinit Binary:
 #####################################################################
 
-qt_add_executable(skipinit
+qt_internal_add_executable(skipinit
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(skipinit
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(skipinit)
+qt_internal_apply_testlib_coverage_options(skipinit)
 # special case end
diff --git a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
index b369f2f8c0..87b8296371 100644
--- a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipinitdata Binary:
 #####################################################################
 
-qt_add_executable(skipinitdata
+qt_internal_add_executable(skipinitdata
     SOURCES
         tst_skipinitdata.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
index fb1d77ba12..cacc40af66 100644
--- a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipinitdata Binary:
 #####################################################################
 
-qt_add_executable(skipinitdata
+qt_internal_add_executable(skipinitdata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(skipinitdata
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(skipinitdata)
+qt_internal_apply_testlib_coverage_options(skipinitdata)
 # special case end
diff --git a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
index 69e4dd0b58..e0e19c9b55 100644
--- a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sleep Binary:
 #####################################################################
 
-qt_add_executable(sleep
+qt_internal_add_executable(sleep
     SOURCES
         tst_sleep.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/sleep/CMakeLists.txt b/tests/auto/testlib/selftests/sleep/CMakeLists.txt
index f77da08532..418c61bab9 100644
--- a/tests/auto/testlib/selftests/sleep/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/sleep/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sleep Binary:
 #####################################################################
 
-qt_add_executable(sleep
+qt_internal_add_executable(sleep
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(sleep
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(sleep)
+qt_internal_apply_testlib_coverage_options(sleep)
 # special case end
diff --git a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
index a02ae81b76..151775652c 100644
--- a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strcmp Binary:
 #####################################################################
 
-qt_add_executable(strcmp
+qt_internal_add_executable(strcmp
     SOURCES
         tst_strcmp.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
index 02898232c5..23919e5c32 100644
--- a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strcmp Binary:
 #####################################################################
 
-qt_add_executable(strcmp
+qt_internal_add_executable(strcmp
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(strcmp
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(strcmp)
+qt_internal_apply_testlib_coverage_options(strcmp)
 # special case end
diff --git a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
index 39243acfc9..99c087bf03 100644
--- a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## subtest Binary:
 #####################################################################
 
-qt_add_executable(subtest
+qt_internal_add_executable(subtest
     SOURCES
         tst_subtest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/subtest/CMakeLists.txt b/tests/auto/testlib/selftests/subtest/CMakeLists.txt
index e27c3a1b4a..fc459b96e2 100644
--- a/tests/auto/testlib/selftests/subtest/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/subtest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## subtest Binary:
 #####################################################################
 
-qt_add_executable(subtest
+qt_internal_add_executable(subtest
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(subtest
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(subtest)
+qt_internal_apply_testlib_coverage_options(subtest)
 # special case end
diff --git a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
index 8e95483b3c..680409cc7d 100644
--- a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testlib Binary:
 #####################################################################
 
-qt_add_executable(testlib
+qt_internal_add_executable(testlib
     SOURCES
         tst_testlib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/testlib/CMakeLists.txt b/tests/auto/testlib/selftests/testlib/CMakeLists.txt
index 0144bd8eee..776f503bf2 100644
--- a/tests/auto/testlib/selftests/testlib/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/testlib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testlib Binary:
 #####################################################################
 
-qt_add_executable(testlib
+qt_internal_add_executable(testlib
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(testlib
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(testlib)
+qt_internal_apply_testlib_coverage_options(testlib)
 # special case end
diff --git a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
index 90dd3bf6a9..71062b5dba 100644
--- a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tuplediagnostics Binary:
 #####################################################################
 
-qt_add_executable(tuplediagnostics
+qt_internal_add_executable(tuplediagnostics
     SOURCES
         tst_tuplediagnostics.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
index f26a1ea5d6..bf72eeae0b 100644
--- a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tuplediagnostics Binary:
 #####################################################################
 
-qt_add_executable(tuplediagnostics
+qt_internal_add_executable(tuplediagnostics
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -14,5 +14,5 @@ qt_add_executable(tuplediagnostics
 )
 
 # special case begin
-qt_apply_testlib_coverage_options(tuplediagnostics)
+qt_internal_apply_testlib_coverage_options(tuplediagnostics)
 # special case end
diff --git a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
index bb821ab639..3b5039c213 100644
--- a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verbose1 Binary:
 #####################################################################
 
-qt_add_executable(verbose1
+qt_internal_add_executable(verbose1
     SOURCES
         ../counting/tst_counting.cpp
     DEFINES
diff --git a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
index 2a827d4247..7f60820111 100644
--- a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verbose1 Binary:
 #####################################################################
 
-qt_add_executable(verbose1
+qt_internal_add_executable(verbose1
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -19,5 +19,5 @@ qt_add_executable(verbose1
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(verbose1)
+qt_internal_apply_testlib_coverage_options(verbose1)
 # special case end
diff --git a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
index fcef3dc5ec..4704a90d34 100644
--- a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verbose2 Binary:
 #####################################################################
 
-qt_add_executable(verbose2
+qt_internal_add_executable(verbose2
     SOURCES
         ../counting/tst_counting.cpp
     DEFINES
diff --git a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
index 99a821d452..63eae28728 100644
--- a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verbose2 Binary:
 #####################################################################
 
-qt_add_executable(verbose2
+qt_internal_add_executable(verbose2
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -19,5 +19,5 @@ qt_add_executable(verbose2
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(verbose2)
+qt_internal_apply_testlib_coverage_options(verbose2)
 # special case end
diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
index a5c4c6c156..989827573b 100644
--- a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verifyexceptionthrown Binary:
 #####################################################################
 
-qt_add_executable(verifyexceptionthrown
+qt_internal_add_executable(verifyexceptionthrown
     EXCEPTIONS
     SOURCES
         tst_verifyexceptionthrown.cpp
diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
index b6467bdba8..b6177bc8c3 100644
--- a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verifyexceptionthrown Binary:
 #####################################################################
 
-qt_add_executable(verifyexceptionthrown
+qt_internal_add_executable(verifyexceptionthrown
     EXCEPTIONS
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
@@ -18,5 +18,5 @@ qt_add_executable(verifyexceptionthrown
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(verifyexceptionthrown)
+qt_internal_apply_testlib_coverage_options(verifyexceptionthrown)
 # special case end
diff --git a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
index f87eb13b42..c806b03410 100644
--- a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## warnings Binary:
 #####################################################################
 
-qt_add_executable(warnings
+qt_internal_add_executable(warnings
     SOURCES
         tst_warnings.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/warnings/CMakeLists.txt b/tests/auto/testlib/selftests/warnings/CMakeLists.txt
index ca8268bd37..178a807726 100644
--- a/tests/auto/testlib/selftests/warnings/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/warnings/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## warnings Binary:
 #####################################################################
 
-qt_add_executable(warnings
+qt_internal_add_executable(warnings
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(warnings
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(warnings)
+qt_internal_apply_testlib_coverage_options(warnings)
 # special case end
diff --git a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
index 3d21decf53..5183a6a934 100644
--- a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## watchdog Binary:
 #####################################################################
 
-qt_add_executable(watchdog
+qt_internal_add_executable(watchdog
     SOURCES
         tst_watchdog.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
index 8fed7f8d79..1515e50619 100644
--- a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## watchdog Binary:
 #####################################################################
 
-qt_add_executable(watchdog
+qt_internal_add_executable(watchdog
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -22,5 +22,5 @@ qt_add_executable(watchdog
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(watchdog)
+qt_internal_apply_testlib_coverage_options(watchdog)
 # special case end
diff --git a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
index 7ba9f32691..190f725b73 100644
--- a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## xunit Binary:
 #####################################################################
 
-qt_add_executable(xunit
+qt_internal_add_executable(xunit
     SOURCES
         tst_xunit.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/testlib/selftests/xunit/CMakeLists.txt b/tests/auto/testlib/selftests/xunit/CMakeLists.txt
index 5474ae91f6..c153d085d0 100644
--- a/tests/auto/testlib/selftests/xunit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/xunit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## xunit Binary:
 #####################################################################
 
-qt_add_executable(xunit
+qt_internal_add_executable(xunit
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -17,5 +17,5 @@ qt_add_executable(xunit
 #####################################################################
 
 # special case begin
-qt_apply_testlib_coverage_options(xunit)
+qt_internal_apply_testlib_coverage_options(xunit)
 # special case end
-- 
cgit v1.2.3