CMake: Regenerate tests with new qt_ prefixed APIs

Use pro2cmake with '--api-version 2' to force regenerate
projects to use the new prefixed qt_foo APIs.

Change-Id: I055c4837860319e93aaa6b09d646dda4fc2a4069
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

112 files changed, 116 insertions, 116 deletions

diff --git a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
index 65ef6ac126..765750bb71 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:
 #####################################################################
 
-add_qt_executable(assert
+qt_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 561dc995b2..56a1b33bb4 100644
--- a/tests/auto/testlib/selftests/assert/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/assert/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## assert Binary:
 #####################################################################
 
-add_qt_executable(assert
+qt_add_executable(assert
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
index 755cbecd2e..78ae572e03 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:
 #####################################################################
 
-add_qt_executable(badxml
+qt_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 7f641e8863..8535ceb3cd 100644
--- a/tests/auto/testlib/selftests/badxml/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## badxml Binary:
 #####################################################################
 
-add_qt_executable(badxml
+qt_add_executable(badxml
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
index d6f35cd1de..0dca3616e1 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:
 #####################################################################
 
-add_qt_executable(benchlibcallgrind
+qt_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 e7448cad84..f86bb4ae05 100644
--- a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibcallgrind Binary:
 #####################################################################
 
-add_qt_executable(benchlibcallgrind
+qt_add_executable(benchlibcallgrind
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
index 6b592f7515..69ecc99b51 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:
 #####################################################################
 
-add_qt_executable(benchlibcounting
+qt_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 6976d9aa22..39d5a6e721 100644
--- a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibcounting Binary:
 #####################################################################
 
-add_qt_executable(benchlibcounting
+qt_add_executable(benchlibcounting
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
index a1c6d6711b..e61fc6f93e 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:
 #####################################################################
 
-add_qt_executable(benchlibeventcounter
+qt_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 aa744e5a49..0b626def35 100644
--- a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibeventcounter Binary:
 #####################################################################
 
-add_qt_executable(benchlibeventcounter
+qt_add_executable(benchlibeventcounter
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
index d38392c896..73c72a5621 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:
 #####################################################################
 
-add_qt_executable(benchliboptions
+qt_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 67ac2fe05c..fdb8218406 100644
--- a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchliboptions Binary:
 #####################################################################
 
-add_qt_executable(benchliboptions
+qt_add_executable(benchliboptions
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
index ec0981c306..10696754dc 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:
 #####################################################################
 
-add_qt_executable(benchlibtickcounter
+qt_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 c55c94c776..9c689584f8 100644
--- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibtickcounter Binary:
 #####################################################################
 
-add_qt_executable(benchlibtickcounter
+qt_add_executable(benchlibtickcounter
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
index 0e098ace32..372dfe014f 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:
 #####################################################################
 
-add_qt_executable(benchlibwalltime
+qt_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 84fc8d46bc..3266361433 100644
--- a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## benchlibwalltime Binary:
 #####################################################################
 
-add_qt_executable(benchlibwalltime
+qt_add_executable(benchlibwalltime
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
index 9fe9796a79..5083fe8a52 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:
 #####################################################################
 
-add_qt_executable(blacklisted
+qt_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 d405512565..3b924c12bc 100644
--- a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## blacklisted Binary:
 #####################################################################
 
-add_qt_executable(blacklisted
+qt_add_executable(blacklisted
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
index 417b99571d..abc5f9b023 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:
 #####################################################################
 
-add_qt_executable(cmptest
+qt_add_executable(cmptest
     SOURCES
         tst_cmptest.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_executable(cmptest
 ## Scopes:
 #####################################################################
 
-extend_target(cmptest CONDITION TARGET Qt::Gui
+qt_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 891b410c40..336fb01e74 100644
--- a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cmptest Binary:
 #####################################################################
 
-add_qt_executable(cmptest
+qt_add_executable(cmptest
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
@@ -16,7 +16,7 @@ add_qt_executable(cmptest
 ## Scopes:
 #####################################################################
 
-extend_target(cmptest CONDITION TARGET Qt::Gui
+qt_extend_target(cmptest CONDITION TARGET Qt::Gui
     PUBLIC_LIBRARIES
         Qt::Gui
 )
diff --git a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
index a49902c26b..2f08f35c03 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:
 #####################################################################
 
-add_qt_executable(commandlinedata
+qt_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 ddd10f2bfc..889ef5377f 100644
--- a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## commandlinedata Binary:
 #####################################################################
 
-add_qt_executable(commandlinedata
+qt_add_executable(commandlinedata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
index 8ad3c38e88..88b5ffb603 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:
 #####################################################################
 
-add_qt_executable(counting
+qt_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 7a7ffa75a9..1a7af9ba4f 100644
--- a/tests/auto/testlib/selftests/counting/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/counting/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## counting Binary:
 #####################################################################
 
-add_qt_executable(counting
+qt_add_executable(counting
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
index 2e54976ebc..eb1e941c5c 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:
 #####################################################################
 
-add_qt_executable(crashes
+qt_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 2d201d4fb2..6e340067ec 100644
--- a/tests/auto/testlib/selftests/crashes/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/crashes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## crashes Binary:
 #####################################################################
 
-add_qt_executable(crashes
+qt_add_executable(crashes
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
index fbe3bfca40..c7e2532c47 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:
 #####################################################################
 
-add_qt_executable(datatable
+qt_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 f99dee1644..8d7abc7fbf 100644
--- a/tests/auto/testlib/selftests/datatable/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datatable/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## datatable Binary:
 #####################################################################
 
-add_qt_executable(datatable
+qt_add_executable(datatable
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
index 8f0bca0d89..eb0040c218 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:
 #####################################################################
 
-add_qt_executable(datetime
+qt_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 eb46c3e3c6..ade9978801 100644
--- a/tests/auto/testlib/selftests/datetime/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/datetime/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## datetime Binary:
 #####################################################################
 
-add_qt_executable(datetime
+qt_add_executable(datetime
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
index 6195be45ee..0b41340fdc 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:
 #####################################################################
 
-add_qt_executable(deleteLater
+qt_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 48eee2eb14..8ba9a7ed2b 100644
--- a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## deleteLater Binary:
 #####################################################################
 
-add_qt_executable(deleteLater
+qt_add_executable(deleteLater
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
index bd90a192ac..88bb80bd67 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:
 #####################################################################
 
-add_qt_executable(deleteLater_noApp
+qt_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 4fe6d01a58..f681aafc35 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:
 #####################################################################
 
-add_qt_executable(deleteLater_noApp
+qt_add_executable(deleteLater_noApp
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
index 9cab4de93b..69e37e0699 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:
 #####################################################################
 
-add_qt_executable(differentexec
+qt_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 49bcb6e4f0..45e0a948fd 100644
--- a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentexec Binary:
 #####################################################################
 
-add_qt_executable(differentexec
+qt_add_executable(differentexec
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
index fdd95e0805..db2c576930 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:
 #####################################################################
 
-add_qt_executable(exceptionthrow
+qt_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 c6e37864f1..33ecfe585c 100644
--- a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## exceptionthrow Binary:
 #####################################################################
 
-add_qt_executable(exceptionthrow
+qt_add_executable(exceptionthrow
     EXCEPTIONS
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
diff --git a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
index 175bd8129a..faa09bbc6c 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:
 #####################################################################
 
-add_qt_executable(expectfail
+qt_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 d4b0ee3f62..a7b072cfd3 100644
--- a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## expectfail Binary:
 #####################################################################
 
-add_qt_executable(expectfail
+qt_add_executable(expectfail
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
index 6369874983..6a8238af81 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:
 #####################################################################
 
-add_qt_executable(failcleanup
+qt_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 8c7c02bb5d..fc02ec1fed 100644
--- a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failcleanup Binary:
 #####################################################################
 
-add_qt_executable(failcleanup
+qt_add_executable(failcleanup
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
index e03a4333bd..2c67f1d445 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:
 #####################################################################
 
-add_qt_executable(faildatatype
+qt_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 65051d3183..45c8e46777 100644
--- a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## faildatatype Binary:
 #####################################################################
 
-add_qt_executable(faildatatype
+qt_add_executable(faildatatype
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
index 6ab21d845f..0323acd635 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:
 #####################################################################
 
-add_qt_executable(failfetchtype
+qt_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 2bd6ed310b..7f02dac54b 100644
--- a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failfetchtype Binary:
 #####################################################################
 
-add_qt_executable(failfetchtype
+qt_add_executable(failfetchtype
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
index 22817fa186..42909ca3c5 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:
 #####################################################################
 
-add_qt_executable(failinit
+qt_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 b6c076dbaa..8ad3130c3c 100644
--- a/tests/auto/testlib/selftests/failinit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failinit Binary:
 #####################################################################
 
-add_qt_executable(failinit
+qt_add_executable(failinit
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
index 5d519c9196..4ae38831a1 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:
 #####################################################################
 
-add_qt_executable(failinitdata
+qt_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 a10ad36e08..2679d2eed5 100644
--- a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## failinitdata Binary:
 #####################################################################
 
-add_qt_executable(failinitdata
+qt_add_executable(failinitdata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
index af1ea19d32..76fee4606d 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:
 #####################################################################
 
-add_qt_executable(fetchbogus
+qt_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 c6a4611e98..7ad4fe65ae 100644
--- a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## fetchbogus Binary:
 #####################################################################
 
-add_qt_executable(fetchbogus
+qt_add_executable(fetchbogus
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
index dc21a4d25f..768abb6824 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:
 #####################################################################
 
-add_qt_executable(findtestdata
+qt_add_executable(findtestdata
     SOURCES
         findtestdata.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(findtestdata_resource_files
     "qt.conf"
 )
 
-add_qt_resource(findtestdata "findtestdata"
+qt_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 e565d611c2..2a3302fb3e 100644
--- a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## findtestdata Binary:
 #####################################################################
 
-add_qt_executable(findtestdata
+qt_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"
 )
 
-add_qt_resource(findtestdata "findtestdata"
+qt_add_resource(findtestdata "findtestdata"
     PREFIX
         "/qt/etc/"
     FILES
diff --git a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
index dfcf2349ad..8b47df4c03 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:
 #####################################################################
 
-add_qt_executable(float
+qt_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 0fd7e4f455..2eb3264acd 100644
--- a/tests/auto/testlib/selftests/float/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/float/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## float Binary:
 #####################################################################
 
-add_qt_executable(float
+qt_add_executable(float
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
index 1cff8f1b27..0ad5394732 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:
 #####################################################################
 
-add_qt_executable(globaldata
+qt_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 679b54cbb4..a2035f4bcf 100644
--- a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## globaldata Binary:
 #####################################################################
 
-add_qt_executable(globaldata
+qt_add_executable(globaldata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
index 86c58467bf..3eb954cfa6 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:
 #####################################################################
 
-add_qt_executable(keyboard
+qt_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 88fab9284a..120cf1f82c 100644
--- a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## keyboard Binary:
 #####################################################################
 
-add_qt_executable(keyboard
+qt_add_executable(keyboard
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
index 9f1c6bc8ad..f2757e9760 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:
 #####################################################################
 
-add_qt_executable(longstring
+qt_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 f4a0defd1c..66554f871e 100644
--- a/tests/auto/testlib/selftests/longstring/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/longstring/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## longstring Binary:
 #####################################################################
 
-add_qt_executable(longstring
+qt_add_executable(longstring
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
index a05c9afb13..a0d3f9f1e0 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:
 #####################################################################
 
-add_qt_executable(maxwarnings
+qt_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 272188ab76..25c40909de 100644
--- a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## maxwarnings Binary:
 #####################################################################
 
-add_qt_executable(maxwarnings
+qt_add_executable(maxwarnings
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
index 4308195d73..88749cbd57 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:
 #####################################################################
 
-add_qt_executable(mouse
+qt_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 7a99f3d55f..3059947fe2 100644
--- a/tests/auto/testlib/selftests/mouse/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mouse Binary:
 #####################################################################
 
-add_qt_executable(mouse
+qt_add_executable(mouse
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
index 6c237edd05..746399f451 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:
 #####################################################################
 
-add_qt_executable(multiexec
+qt_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 88dbc7b53b..5ccd011975 100644
--- a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiexec Binary:
 #####################################################################
 
-add_qt_executable(multiexec
+qt_add_executable(multiexec
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
index 05e8518413..30ca138997 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:
 #####################################################################
 
-add_qt_executable(pairdiagnostics
+qt_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 11de82b1c5..ce5faf810b 100644
--- a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pairdiagnostics Binary:
 #####################################################################
 
-add_qt_executable(pairdiagnostics
+qt_add_executable(pairdiagnostics
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
index 8c9174ca44..174a6faf7c 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:
 #####################################################################
 
-add_qt_executable(printdatatags
+qt_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 0c23a422c7..7ab050857f 100644
--- a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## printdatatags Binary:
 #####################################################################
 
-add_qt_executable(printdatatags
+qt_add_executable(printdatatags
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
index 161051cec4..0922d380d3 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:
 #####################################################################
 
-add_qt_executable(printdatatagswithglobaltags
+qt_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 5046a59fe7..9d9edf1fae 100644
--- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## printdatatagswithglobaltags Binary:
 #####################################################################
 
-add_qt_executable(printdatatagswithglobaltags
+qt_add_executable(printdatatagswithglobaltags
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
index 2a33f2dc4d..50cf4d8473 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:
 #####################################################################
 
-add_qt_executable(qexecstringlist
+qt_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 ea890641ef..22ad5b7911 100644
--- a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qexecstringlist Binary:
 #####################################################################
 
-add_qt_executable(qexecstringlist
+qt_add_executable(qexecstringlist
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
index b3244b899d..e0f9e38293 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:
 #####################################################################
 
-add_qt_executable(signaldumper
+qt_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 588325b7a7..67ae4e690a 100644
--- a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## signaldumper Binary:
 #####################################################################
 
-add_qt_executable(signaldumper
+qt_add_executable(signaldumper
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
index 113f8aac80..205586621a 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:
 #####################################################################
 
-add_qt_executable(silent
+qt_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 c62a590181..873e7e1fe9 100644
--- a/tests/auto/testlib/selftests/silent/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## silent Binary:
 #####################################################################
 
-add_qt_executable(silent
+qt_add_executable(silent
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
index 60d4984df8..8813e9a759 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:
 #####################################################################
 
-add_qt_executable(singleskip
+qt_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 a025bd923f..158c8dd094 100644
--- a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## singleskip Binary:
 #####################################################################
 
-add_qt_executable(singleskip
+qt_add_executable(singleskip
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
index 2eaac745a8..74d7e19cf3 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:
 #####################################################################
 
-add_qt_executable(skip
+qt_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 cf7767ad65..5b7e35e4ce 100644
--- a/tests/auto/testlib/selftests/skip/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skip/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skip Binary:
 #####################################################################
 
-add_qt_executable(skip
+qt_add_executable(skip
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
index 77673004b2..fba23174bd 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:
 #####################################################################
 
-add_qt_executable(skipcleanup
+qt_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 7e594f7745..fd64c94d9e 100644
--- a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipcleanup Binary:
 #####################################################################
 
-add_qt_executable(skipcleanup
+qt_add_executable(skipcleanup
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
index 4a36d0fa1c..c9af8b4a2c 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:
 #####################################################################
 
-add_qt_executable(skipinit
+qt_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 8d302e4328..564b1cc8a3 100644
--- a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipinit Binary:
 #####################################################################
 
-add_qt_executable(skipinit
+qt_add_executable(skipinit
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
index 7f7773c87c..b369f2f8c0 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:
 #####################################################################
 
-add_qt_executable(skipinitdata
+qt_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 7f5472fb3e..fb1d77ba12 100644
--- a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## skipinitdata Binary:
 #####################################################################
 
-add_qt_executable(skipinitdata
+qt_add_executable(skipinitdata
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
index c176681068..69e4dd0b58 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:
 #####################################################################
 
-add_qt_executable(sleep
+qt_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 37e05ef360..f77da08532 100644
--- a/tests/auto/testlib/selftests/sleep/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/sleep/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sleep Binary:
 #####################################################################
 
-add_qt_executable(sleep
+qt_add_executable(sleep
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
index ff5b402328..a02ae81b76 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:
 #####################################################################
 
-add_qt_executable(strcmp
+qt_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 b942da3320..02898232c5 100644
--- a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strcmp Binary:
 #####################################################################
 
-add_qt_executable(strcmp
+qt_add_executable(strcmp
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
index dd4ad850c6..39243acfc9 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:
 #####################################################################
 
-add_qt_executable(subtest
+qt_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 4b0c892bc3..e27c3a1b4a 100644
--- a/tests/auto/testlib/selftests/subtest/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/subtest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## subtest Binary:
 #####################################################################
 
-add_qt_executable(subtest
+qt_add_executable(subtest
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
index 14a5175693..8e95483b3c 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:
 #####################################################################
 
-add_qt_executable(testlib
+qt_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 baa9d908a1..0144bd8eee 100644
--- a/tests/auto/testlib/selftests/testlib/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/testlib/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testlib Binary:
 #####################################################################
 
-add_qt_executable(testlib
+qt_add_executable(testlib
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
index 7b6b107dff..90dd3bf6a9 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:
 #####################################################################
 
-add_qt_executable(tuplediagnostics
+qt_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 cdc342cef9..f26a1ea5d6 100644
--- a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tuplediagnostics Binary:
 #####################################################################
 
-add_qt_executable(tuplediagnostics
+qt_add_executable(tuplediagnostics
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
index 2f43297908..bb821ab639 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:
 #####################################################################
 
-add_qt_executable(verbose1
+qt_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 fea93a589f..2a827d4247 100644
--- a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verbose1 Binary:
 #####################################################################
 
-add_qt_executable(verbose1
+qt_add_executable(verbose1
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
index d55948ee73..fcef3dc5ec 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:
 #####################################################################
 
-add_qt_executable(verbose2
+qt_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 8be1ebe8a8..99a821d452 100644
--- a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verbose2 Binary:
 #####################################################################
 
-add_qt_executable(verbose2
+qt_add_executable(verbose2
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
index f4e20fcfc6..a5c4c6c156 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:
 #####################################################################
 
-add_qt_executable(verifyexceptionthrown
+qt_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 ca0d7dcc07..b6467bdba8 100644
--- a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## verifyexceptionthrown Binary:
 #####################################################################
 
-add_qt_executable(verifyexceptionthrown
+qt_add_executable(verifyexceptionthrown
     EXCEPTIONS
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
diff --git a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
index 11fb5098d6..f87eb13b42 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:
 #####################################################################
 
-add_qt_executable(warnings
+qt_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 bc0f4dfdd7..ca8268bd37 100644
--- a/tests/auto/testlib/selftests/warnings/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/warnings/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## warnings Binary:
 #####################################################################
 
-add_qt_executable(warnings
+qt_add_executable(warnings
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
index 1ea502875e..3d21decf53 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:
 #####################################################################
 
-add_qt_executable(watchdog
+qt_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 25491dc3d4..8fed7f8d79 100644
--- a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## watchdog Binary:
 #####################################################################
 
-add_qt_executable(watchdog
+qt_add_executable(watchdog
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
index 6a55c59e00..7ba9f32691 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:
 #####################################################################
 
-add_qt_executable(xunit
+qt_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 5ed90af264..5474ae91f6 100644
--- a/tests/auto/testlib/selftests/xunit/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/xunit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## xunit Binary:
 #####################################################################
 
-add_qt_executable(xunit
+qt_add_executable(xunit
     NO_INSTALL # special case
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES