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>

100 files changed, 146 insertions, 146 deletions

diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
index 0c8393631a..b97733003b 100644
--- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
+++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     icons/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qicoimageformat
+qt_add_test(tst_qicoimageformat
     SOURCES
         tst_qicoimageformat.cpp
     PUBLIC_LIBRARIES
@@ -40,7 +40,7 @@ if(ANDROID)
         "icons/valid/yellow.cur"
     )
 
-    add_qt_resource(tst_qicoimageformat "qicoimageformat"
+    qt_add_resource(tst_qicoimageformat "qicoimageformat"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qicon/CMakeLists.txt b/tests/auto/gui/image/qicon/CMakeLists.txt
index 81f5390d79..5f629fb3ed 100644
--- a/tests/auto/gui/image/qicon/CMakeLists.txt
+++ b/tests/auto/gui/image/qicon/CMakeLists.txt
@@ -30,7 +30,7 @@ file(GLOB_RECURSE test_data_glob
     *.svgz)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qicon
+qt_add_test(tst_qicon
     SOURCES
         tst_qicon.cpp
     PUBLIC_LIBRARIES
@@ -67,7 +67,7 @@ set(tst_qicon_resource_files
     "tst_qicon.cpp"
 )
 
-add_qt_resource(tst_qicon "tst_qicon"
+qt_add_resource(tst_qicon "tst_qicon"
     PREFIX
         "/"
     FILES
@@ -77,7 +77,7 @@ set(qmake_immediate_resource_files
     "tst_qicon.cpp"
 )
 
-add_qt_resource(tst_qicon "qmake_immediate"
+qt_add_resource(tst_qicon "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -88,7 +88,7 @@ add_qt_resource(tst_qicon "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qicon CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qicon CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
index 6f6aaedca5..8113422c1e 100644
--- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
+++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     icons/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qiconhighdpi
+qt_add_test(tst_qiconhighdpi
     SOURCES
         tst_qiconhighdpi.cpp
     PUBLIC_LIBRARIES
@@ -28,7 +28,7 @@ set(tst_qiconhighdpi_resource_files
     "icons/testtheme/index.theme"
 )
 
-add_qt_resource(tst_qiconhighdpi "tst_qiconhighdpi"
+qt_add_resource(tst_qiconhighdpi "tst_qiconhighdpi"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt
index f6125d0fe9..a9e3b783a7 100644
--- a/tests/auto/gui/image/qimage/CMakeLists.txt
+++ b/tests/auto/gui/image/qimage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qimage
+qt_add_test(tst_qimage
     SOURCES
         tst_qimage.cpp
     PUBLIC_LIBRARIES
@@ -46,7 +46,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/jpeg_exif_orientation_value_8.jpg"
     )
 
-    add_qt_resource(tst_qimage "qimage"
+    qt_add_resource(tst_qimage "qimage"
         PREFIX
             "/"
         FILES
@@ -54,13 +54,13 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
     )
 endif()
 
-extend_target(tst_qimage CONDITION WIN32
+qt_extend_target(tst_qimage CONDITION WIN32
     PUBLIC_LIBRARIES
         gdi32
         user32
 )
 
-extend_target(tst_qimage CONDITION APPLE
+qt_extend_target(tst_qimage CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWCoreGraphics}
 )
diff --git a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
index 23e5e98b16..53bfb384aa 100644
--- a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
+++ b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qimageiohandler Test:
 #####################################################################
 
-add_qt_test(tst_qimageiohandler
+qt_add_test(tst_qimageiohandler
     SOURCES
         tst_qimageiohandler.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt
index 8a96fa18cf..a477252e73 100644
--- a/tests/auto/gui/image/qimagereader/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
     baseline/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qimagereader
+qt_add_test(tst_qimagereader
     SOURCES
         tst_qimagereader.cpp
     PUBLIC_LIBRARIES
@@ -35,7 +35,7 @@ set(qmake_immediate_resource_files
     ${resource_glob_0}
 )
 
-add_qt_resource(tst_qimagereader "qmake_immediate"
+qt_add_resource(tst_qimagereader "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -56,7 +56,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/trans.gif"
     )
 
-    add_qt_resource(tst_qimagereader "android_testdata"
+    qt_add_resource(tst_qimagereader "android_testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
index 1a04dfbce0..9e5c7362a8 100644
--- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt
+++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qimagewriter
+qt_add_test(tst_qimagewriter
     SOURCES
         tst_qimagewriter.cpp
     PUBLIC_LIBRARIES
@@ -41,7 +41,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "images/trolltech.gif"
     )
 
-    add_qt_resource(tst_qimagewriter "qimagewriter"
+    qt_add_resource(tst_qimagewriter "qimagewriter"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/image/qmovie/CMakeLists.txt b/tests/auto/gui/image/qmovie/CMakeLists.txt
index bc841b5d29..3e9b2ad100 100644
--- a/tests/auto/gui/image/qmovie/CMakeLists.txt
+++ b/tests/auto/gui/image/qmovie/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     animations/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qmovie
+qt_add_test(tst_qmovie
     SOURCES
         tst_qmovie.cpp
     PUBLIC_LIBRARIES
@@ -25,7 +25,7 @@ set(resources_resource_files
     "animations/trolltech.gif"
 )
 
-add_qt_resource(tst_qmovie "resources"
+qt_add_resource(tst_qmovie "resources"
     PREFIX
         "/"
     FILES
@@ -40,17 +40,17 @@ add_qt_resource(tst_qmovie "resources"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(tst_qmovie CONDITION QT_FEATURE_gif
+qt_extend_target(tst_qmovie CONDITION QT_FEATURE_gif
     DEFINES
         QTEST_HAVE_GIF
 )
 
-extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
+qt_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
     DEFINES
         QTEST_HAVE_JPEG
 )
diff --git a/tests/auto/gui/image/qpicture/CMakeLists.txt b/tests/auto/gui/image/qpicture/CMakeLists.txt
index 625d19b3a5..f79c72974a 100644
--- a/tests/auto/gui/image/qpicture/CMakeLists.txt
+++ b/tests/auto/gui/image/qpicture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpicture Test:
 #####################################################################
 
-add_qt_test(tst_qpicture
+qt_add_test(tst_qpicture
     SOURCES
         tst_qpicture.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt
index efdfb3b98e..b58609a760 100644
--- a/tests/auto/gui/image/qpixmap/CMakeLists.txt
+++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
     images/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qpixmap
+qt_add_test(tst_qpixmap
     SOURCES
         tst_qpixmap.cpp
     PUBLIC_LIBRARIES
@@ -83,7 +83,7 @@ set(qpixmap_resource_files
     "loadFromData/designer_rgb32.png"
 )
 
-add_qt_resource(tst_qpixmap "qpixmap"
+qt_add_resource(tst_qpixmap "qpixmap"
     PREFIX
         "/"
     FILES
@@ -94,13 +94,13 @@ add_qt_resource(tst_qpixmap "qpixmap"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
         Qt::WidgetsPrivate
 )
 
-extend_target(tst_qpixmap CONDITION WIN32
+qt_extend_target(tst_qpixmap CONDITION WIN32
     PUBLIC_LIBRARIES
         gdi32
         user32
diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
index ef73f60ca6..33c1faf865 100644
--- a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
+++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpixmapcache Test:
 #####################################################################
 
-add_qt_test(tst_qpixmapcache
+qt_add_test(tst_qpixmapcache
     SOURCES
         tst_qpixmapcache.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
index 8a19f6afaf..65f13a10c8 100644
--- a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
+++ b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstandarditem Test:
 #####################################################################
 
-add_qt_test(tst_qstandarditem
+qt_add_test(tst_qstandarditem
     SOURCES
         tst_qstandarditem.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
index 4a6ea22d13..262b2ad2f2 100644
--- a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_noqteventloop Test:
 #####################################################################
 
-add_qt_test(tst_noqteventloop
+qt_add_test(tst_noqteventloop
     SOURCES
         tst_noqteventloop.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_noqteventloop
 ## Scopes:
 #####################################################################
 
-extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32
+qt_extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32
     PUBLIC_LIBRARIES
         user32
 )
diff --git a/tests/auto/gui/kernel/qaction/CMakeLists.txt b/tests/auto/gui/kernel/qaction/CMakeLists.txt
index bdd1a1d165..70065156ca 100644
--- a/tests/auto/gui/kernel/qaction/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qaction/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qaction_kernel Test:
 #####################################################################
 
-add_qt_test(tst_qaction_kernel
+qt_add_test(tst_qaction_kernel
     SOURCES
         tst_qaction.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
index bcab5e05a2..e313aebec5 100644
--- a/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qactiongroup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qactiongroup_kernel Test:
 #####################################################################
 
-add_qt_test(tst_qactiongroup_kernel
+qt_add_test(tst_qactiongroup_kernel
     SOURCES
         tst_qactiongroup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
index 639e88fb4c..55d53545bb 100644
--- a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbackingstore Test:
 #####################################################################
 
-add_qt_test(tst_qbackingstore
+qt_add_test(tst_qbackingstore
     SOURCES
         tst_qbackingstore.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
index e7c1313c7b..dfacb03517 100644
--- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qclipboard Test:
 #####################################################################
 
-add_qt_test(tst_qclipboard
+qt_add_test(tst_qclipboard
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qclipboard.cpp
@@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qclipboard CONDITION MACOS
+qt_extend_target(tst_qclipboard CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/gui/kernel/qcursor/CMakeLists.txt b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
index 8f4062a42a..2c3cf28c1a 100644
--- a/tests/auto/gui/kernel/qcursor/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcursor Test:
 #####################################################################
 
-add_qt_test(tst_qcursor
+qt_add_test(tst_qcursor
     SOURCES
         tst_qcursor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qdrag/CMakeLists.txt b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
index 84bceaf0de..1b13df54d3 100644
--- a/tests/auto/gui/kernel/qdrag/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdrag Test:
 #####################################################################
 
-add_qt_test(tst_qdrag
+qt_add_test(tst_qdrag
     SOURCES
         tst_qdrag.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qevent/CMakeLists.txt b/tests/auto/gui/kernel/qevent/CMakeLists.txt
index 01d6db7225..21a2ddad66 100644
--- a/tests/auto/gui/kernel/qevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qevent Test:
 #####################################################################
 
-add_qt_test(tst_qevent
+qt_add_test(tst_qevent
     SOURCES
         tst_qevent.cpp
 )
diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
index 0c50f7ff56..0b9cd6d481 100644
--- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qfileopeneventexternal Binary:
 #####################################################################
 
-add_qt_executable(qfileopeneventexternal
+qt_add_executable(qfileopeneventexternal
     GUI
     SOURCES
         qfileopeneventexternal.cpp
diff --git a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
index 6695ef42b3..a306a3eae6 100644
--- a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfileopenevent Test:
 #####################################################################
 
-add_qt_test(tst_qfileopenevent
+qt_add_test(tst_qfileopenevent
     SOURCES
         tst_qfileopenevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
index 30a6436ece..0da40c5aa3 100644
--- a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qguiapplication Test:
 #####################################################################
 
-add_qt_test(tst_qguiapplication
+qt_add_test(tst_qguiapplication
     SOURCES
         tst_qcoreapplication.cpp tst_qcoreapplication.h
         tst_qguiapplication.cpp
@@ -27,7 +27,7 @@ set(tst_qguiapplication_resource_files
     "icons/usericon.png"
 )
 
-add_qt_resource(tst_qguiapplication "tst_qguiapplication"
+qt_add_resource(tst_qguiapplication "tst_qguiapplication"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
index 24fa6572c1..a98123aa64 100644
--- a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
@@ -16,8 +16,8 @@ else()
 endif()
 # special case end
 
-add_qt_test(tst_qguiapplication
-    VERSION ${target_version}
+qt_add_test(tst_qguiapplication
+    VERSION ${target_version} # special case
     SOURCES
         ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.h # special case
         tst_qguiapplication.cpp
@@ -37,7 +37,7 @@ set(tst_qguiapplication_resource_files
     "icons/usericon.png"
 )
 
-add_qt_resource(tst_qguiapplication "tst_qguiapplication"
+qt_add_resource(tst_qguiapplication "tst_qguiapplication"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
index eb36e0ece7..14babc165c 100644
--- a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguieventdispatcher Test:
 #####################################################################
 
-add_qt_test(tst_qguieventdispatcher
+qt_add_test(tst_qguieventdispatcher
     SOURCES
         ../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
index 3fd943c83c..8d62d716a5 100644
--- a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguieventloop Test:
 #####################################################################
 
-add_qt_test(tst_qguieventloop
+qt_add_test(tst_qguieventloop
     SOURCES
         ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
     PUBLIC_LIBRARIES
@@ -16,12 +16,12 @@ add_qt_test(tst_qguieventloop
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qguieventloop CONDITION WIN32
+qt_extend_target(tst_qguieventloop CONDITION WIN32
     PUBLIC_LIBRARIES
         user32
 )
 
-extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
+qt_extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
     DEFINES
         HAVE_GLIB
 )
diff --git a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
index 3701b3983a..d124b08828 100644
--- a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguimetatype Test:
 #####################################################################
 
-add_qt_test(tst_qguimetatype
+qt_add_test(tst_qguimetatype
     SOURCES
         tst_qguimetatype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
index c4e5117e8c..8c2ec60bdf 100644
--- a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguitimer Test:
 #####################################################################
 
-add_qt_test(tst_qguitimer
+qt_add_test(tst_qguitimer
     SOURCES
         ../../../corelib/kernel/qtimer/tst_qtimer.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
index 2be3339fe3..52be3ed547 100644
--- a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguitimer Test:
 #####################################################################
 
-add_qt_test(tst_qguitimer
+qt_add_test(tst_qguitimer
     SOURCES
         ../../../corelib/kernel/qtimer/tst_qtimer.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
index 8261212801..344b81bf6d 100644
--- a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## no_application Test:
 #####################################################################
 
-add_qt_test(no_application
+qt_add_test(no_application
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
index af2cea60e6..93efaf2aeb 100644
--- a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qguivariant Test:
 #####################################################################
 
-add_qt_test(tst_qguivariant
+qt_add_test(tst_qguivariant
     SOURCES
         tst_qguivariant.cpp
     INCLUDE_DIRECTORIES
@@ -19,7 +19,7 @@ set(tst_qguivariant_resource_files
     "black2.png"
 )
 
-add_qt_resource(tst_qguivariant "tst_qguivariant"
+qt_add_resource(tst_qguivariant "tst_qguivariant"
     PREFIX
         "/"
     FILES
@@ -29,7 +29,7 @@ set(qguivariant_resource_files
     "data"
 )
 
-add_qt_resource(tst_qguivariant "qguivariant"
+qt_add_resource(tst_qguivariant "qguivariant"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
index 18d4968695..5c368838ab 100644
--- a/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputdevice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qinputdevice Test:
 #####################################################################
 
-add_qt_test(tst_qinputdevice
+qt_add_test(tst_qinputdevice
     SOURCES
         tst_qinputdevice.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
index 2eee15b816..bdd4940392 100644
--- a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qinputmethod Test:
 #####################################################################
 
-add_qt_test(tst_qinputmethod
+qt_add_test(tst_qinputmethod
     SOURCES
         tst_qinputmethod.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
index 2e36795375..3c48a6492b 100644
--- a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qkeyevent Test:
 #####################################################################
 
-add_qt_test(tst_qkeyevent
+qt_add_test(tst_qkeyevent
     SOURCES
         tst_qkeyevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
index 07e480c9dd..f5a0c38fe4 100644
--- a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qkeysequence Test:
 #####################################################################
 
-add_qt_test(tst_qkeysequence
+qt_add_test(tst_qkeysequence
     SOURCES
         tst_qkeysequence.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(qkeysequence_resource_files
     "qt_de.qm"
 )
 
-add_qt_resource(tst_qkeysequence "qkeysequence"
+qt_add_resource(tst_qkeysequence "qkeysequence"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
index 4e1081c6ad..4d31363d64 100644
--- a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmouseevent Test:
 #####################################################################
 
-add_qt_test(tst_qmouseevent
+qt_add_test(tst_qmouseevent
     SOURCES
         tst_qmouseevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
index c7f447ffeb..afe9fe33ed 100644
--- a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmouseevent_modal Test:
 #####################################################################
 
-add_qt_test(tst_qmouseevent_modal
+qt_add_test(tst_qmouseevent_modal
     SOURCES
         tst_qmouseevent_modal.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
index 4176be9840..1a460a567f 100644
--- a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qopenglwindow Test:
 #####################################################################
 
-add_qt_test(tst_qopenglwindow
+qt_add_test(tst_qopenglwindow
     SOURCES
         tst_qopenglwindow.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qpalette/CMakeLists.txt b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
index 4bd2ce7cc5..acb413007e 100644
--- a/tests/auto/gui/kernel/qpalette/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpalette Test:
 #####################################################################
 
-add_qt_test(tst_qpalette
+qt_add_test(tst_qpalette
     SOURCES
         tst_qpalette.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
index 43deb02af1..907564dc3d 100644
--- a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpixelformat Test:
 #####################################################################
 
-add_qt_test(tst_qpixelformat
+qt_add_test(tst_qpixelformat
     SOURCES
         tst_qpixelformat.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
index 9b586ce4c8..6b34b71dac 100644
--- a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrasterwindow Test:
 #####################################################################
 
-add_qt_test(tst_qrasterwindow
+qt_add_test(tst_qrasterwindow
     SOURCES
         tst_qrasterwindow.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qscreen/CMakeLists.txt b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
index dd54db4753..b073070155 100644
--- a/tests/auto/gui/kernel/qscreen/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qscreen Test:
 #####################################################################
 
-add_qt_test(tst_qscreen
+qt_add_test(tst_qscreen
     SOURCES
         tst_qscreen.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
index fab20dceed..8c3c2556fe 100644
--- a/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qshortcut/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshortcut_kernel Test:
 #####################################################################
 
-add_qt_test(tst_qshortcut_kernel
+qt_add_test(tst_qshortcut_kernel
     SOURCES
         tst_qshortcut.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
index d12e1da106..1d319aaddd 100644
--- a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsurfaceformat Test:
 #####################################################################
 
-add_qt_test(tst_qsurfaceformat
+qt_add_test(tst_qsurfaceformat
     SOURCES
         tst_qsurfaceformat.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
index 7d489e3066..a2976c351f 100644
--- a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtouchevent Test:
 #####################################################################
 
-add_qt_test(tst_qtouchevent
+qt_add_test(tst_qtouchevent
     SOURCES
         tst_qtouchevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/kernel/qwindow/CMakeLists.txt b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
index 60603a219b..84b46b76f5 100644
--- a/tests/auto/gui/kernel/qwindow/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwindow Test:
 #####################################################################
 
-add_qt_test(tst_qwindow
+qt_add_test(tst_qwindow
     SOURCES
         tst_qwindow.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ add_qt_test(tst_qwindow
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32
+qt_extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32
     PUBLIC_LIBRARIES
         user32
 )
diff --git a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
index 71daeba361..fb2c3ef813 100644
--- a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmatrixnxn Test:
 #####################################################################
 
-add_qt_test(tst_qmatrixnxn
+qt_add_test(tst_qmatrixnxn
     SOURCES
         tst_qmatrixnxn.cpp
     DEFINES
diff --git a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
index 77d035cbf9..dec4a3d352 100644
--- a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qquaternion Test:
 #####################################################################
 
-add_qt_test(tst_qquaternion
+qt_add_test(tst_qquaternion
     SOURCES
         tst_qquaternion.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
index 5d8a373234..7dd6fe0dcb 100644
--- a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
+++ b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qvectornd Test:
 #####################################################################
 
-add_qt_test(tst_qvectornd
+qt_add_test(tst_qvectornd
     SOURCES
         tst_qvectornd.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpagesize/CMakeLists.txt b/tests/auto/gui/painting/qpagesize/CMakeLists.txt
index 260abfbc0f..706fa3e402 100644
--- a/tests/auto/gui/painting/qpagesize/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpagesize/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpagesize Test:
 #####################################################################
 
-add_qt_test(tst_qpagesize
+qt_add_test(tst_qpagesize
     SOURCES
         tst_qpagesize.cpp
     DEFINES
diff --git a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
index 8125a98d3e..602bfe7316 100644
--- a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpaintengine Test:
 #####################################################################
 
-add_qt_test(tst_qpaintengine
+qt_add_test(tst_qpaintengine
     SOURCES
         tst_qpaintengine.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
index c2c88cc258..edc1ab14bf 100644
--- a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpainterpath Test:
 #####################################################################
 
-add_qt_test(tst_qpainterpath
+qt_add_test(tst_qpainterpath
     SOURCES
         tst_qpainterpath.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
index a1c5f6547f..1344682991 100644
--- a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpainterpathstroker Test:
 #####################################################################
 
-add_qt_test(tst_qpainterpathstroker
+qt_add_test(tst_qpainterpathstroker
     SOURCES
         tst_qpainterpathstroker.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/painting/qpen/CMakeLists.txt b/tests/auto/gui/painting/qpen/CMakeLists.txt
index d096f7a6ce..076d15b1d1 100644
--- a/tests/auto/gui/painting/qpen/CMakeLists.txt
+++ b/tests/auto/gui/painting/qpen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpen Test:
 #####################################################################
 
-add_qt_test(tst_qpen
+qt_add_test(tst_qpen
     SOURCES
         tst_qpen.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt
index 1c7c9b6ec0..a32730fd70 100644
--- a/tests/auto/gui/qopengl/CMakeLists.txt
+++ b/tests/auto/gui/qopengl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qopengl Test:
 #####################################################################
 
-add_qt_test(tst_qopengl
+qt_add_test(tst_qopengl
     SOURCES
         tst_qopengl.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_qopengl
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
+qt_extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
     DEFINES
         USE_GLX
 )
diff --git a/tests/auto/gui/qopenglconfig/CMakeLists.txt b/tests/auto/gui/qopenglconfig/CMakeLists.txt
index 26ce58d98c..60fcdb67df 100644
--- a/tests/auto/gui/qopenglconfig/CMakeLists.txt
+++ b/tests/auto/gui/qopenglconfig/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "buglist.json")
 
-add_qt_test(tst_qopenglconfig
+qt_add_test(tst_qopenglconfig
     SOURCES
         tst_qopenglconfig.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/qvulkan/CMakeLists.txt b/tests/auto/gui/qvulkan/CMakeLists.txt
index 6316aa8f68..e3a6643f3d 100644
--- a/tests/auto/gui/qvulkan/CMakeLists.txt
+++ b/tests/auto/gui/qvulkan/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qvulkan Test:
 #####################################################################
 
-add_qt_test(tst_qvulkan
+qt_add_test(tst_qvulkan
     SOURCES
         tst_qvulkan.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/rhi/qrhi/CMakeLists.txt b/tests/auto/gui/rhi/qrhi/CMakeLists.txt
index 8c3026c176..8ea9bf36af 100644
--- a/tests/auto/gui/rhi/qrhi/CMakeLists.txt
+++ b/tests/auto/gui/rhi/qrhi/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrhi Test:
 #####################################################################
 
-add_qt_test(tst_qrhi
+qt_add_test(tst_qrhi
     SOURCES
         tst_qrhi.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ set(qrhi_resource_files
     "data"
 )
 
-add_qt_resource(tst_qrhi "qrhi"
+qt_add_resource(tst_qrhi "qrhi"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/rhi/qshader/CMakeLists.txt b/tests/auto/gui/rhi/qshader/CMakeLists.txt
index 472fc3b7e4..ae35f7e84e 100644
--- a/tests/auto/gui/rhi/qshader/CMakeLists.txt
+++ b/tests/auto/gui/rhi/qshader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshader Test:
 #####################################################################
 
-add_qt_test(tst_qshader
+qt_add_test(tst_qshader
     SOURCES
         tst_qshader.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ set(qshader_resource_files
     "data"
 )
 
-add_qt_resource(tst_qshader "qshader"
+qt_add_resource(tst_qshader "qshader"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
index 62d4ce9d32..28df19d195 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstracttextdocumentlayout Test:
 #####################################################################
 
-add_qt_test(tst_qabstracttextdocumentlayout
+qt_add_test(tst_qabstracttextdocumentlayout
     SOURCES
         tst_qabstracttextdocumentlayout.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt
index 09e1672bc4..dc86787c45 100644
--- a/tests/auto/gui/text/qcssparser/CMakeLists.txt
+++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 # Collect test data
 list(APPEND test_data "testdata")
 
-add_qt_test(tst_qcssparser
+qt_add_test(tst_qcssparser
     SOURCES
         tst_qcssparser.cpp
     DEFINES
@@ -48,7 +48,7 @@ if(ANDROID)
         "testdata/scanner/unicode/output"
     )
 
-    add_qt_resource(tst_qcssparser "testdata"
+    qt_add_resource(tst_qcssparser "testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt
index a04f8365b1..b7e30318fb 100644
--- a/tests/auto/gui/text/qfont/CMakeLists.txt
+++ b/tests/auto/gui/text/qfont/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfont Test:
 #####################################################################
 
-add_qt_test(tst_qfont
+qt_add_test(tst_qfont
     SOURCES
         tst_qfont.cpp
     PUBLIC_LIBRARIES
@@ -18,7 +18,7 @@ set(testfont_resource_files
     "weirdfont.otf"
 )
 
-add_qt_resource(tst_qfont "testfont"
+qt_add_resource(tst_qfont "testfont"
     PREFIX
         "/"
     FILES
@@ -29,7 +29,7 @@ add_qt_resource(tst_qfont "testfont"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qfont CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qfont CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qfontcache/CMakeLists.txt b/tests/auto/gui/text/qfontcache/CMakeLists.txt
index 84f6373328..374854b410 100644
--- a/tests/auto/gui/text/qfontcache/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfontcache Test:
 #####################################################################
 
-add_qt_test(tst_qfontcache
+qt_add_test(tst_qfontcache
     SOURCES
         tst_qfontcache.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
index 65c6224a00..f6ff9e8e7d 100644
--- a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "LED_REAL.TTF")
 
-add_qt_test(tst_qfontdatabase
+qt_add_test(tst_qfontdatabase
     SOURCES
         tst_qfontdatabase.cpp
     PUBLIC_LIBRARIES
@@ -38,7 +38,7 @@ set(testdata_resource_files
     "LED_REAL.TTF"
 )
 
-add_qt_resource(tst_qfontdatabase "testdata"
+qt_add_resource(tst_qfontdatabase "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
index 029f5d5ce3..b0b8eb3f42 100644
--- a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfontmetrics Test:
 #####################################################################
 
-add_qt_test(tst_qfontmetrics
+qt_add_test(tst_qfontmetrics
     SOURCES
         tst_qfontmetrics.cpp
     PUBLIC_LIBRARIES
@@ -22,7 +22,7 @@ set(testfont_resource_files
     "ucs4font.ttf"
 )
 
-add_qt_resource(tst_qfontmetrics "testfont"
+qt_add_resource(tst_qfontmetrics "testfont"
     PREFIX
         "/fonts"
     FILES
diff --git a/tests/auto/gui/text/qglyphrun/CMakeLists.txt b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
index 8efcfc0cf9..7ea92f2924 100644
--- a/tests/auto/gui/text/qglyphrun/CMakeLists.txt
+++ b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qglyphrun Test:
 #####################################################################
 
-add_qt_test(tst_qglyphrun
+qt_add_test(tst_qglyphrun
     SOURCES
         tst_qglyphrun.cpp
     PUBLIC_LIBRARIES
@@ -19,7 +19,7 @@ set(testdata_resource_files
     "../../../shared/resources/test.ttf"
 )
 
-add_qt_resource(tst_qglyphrun "testdata"
+qt_add_resource(tst_qglyphrun "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
index e544fb313c..f5cdd63ec0 100644
--- a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
+++ b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qinputcontrol Test:
 #####################################################################
 
-add_qt_test(tst_qinputcontrol
+qt_add_test(tst_qinputcontrol
     SOURCES
         tst_qinputcontrol.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qrawfont/CMakeLists.txt b/tests/auto/gui/text/qrawfont/CMakeLists.txt
index 5044866c49..f51d4ec13d 100644
--- a/tests/auto/gui/text/qrawfont/CMakeLists.txt
+++ b/tests/auto/gui/text/qrawfont/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrawfont Test:
 #####################################################################
 
-add_qt_test(tst_qrawfont
+qt_add_test(tst_qrawfont
     SOURCES
         tst_qrawfont.cpp
     PUBLIC_LIBRARIES
@@ -23,7 +23,7 @@ set(testdata_resource_files
     "testfont_os2_v1.ttf"
 )
 
-add_qt_resource(tst_qrawfont "testdata"
+qt_add_resource(tst_qrawfont "testdata"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/text/qstatictext/CMakeLists.txt b/tests/auto/gui/text/qstatictext/CMakeLists.txt
index 80eef2f254..1c182b3659 100644
--- a/tests/auto/gui/text/qstatictext/CMakeLists.txt
+++ b/tests/auto/gui/text/qstatictext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstatictext Test:
 #####################################################################
 
-add_qt_test(tst_qstatictext
+qt_add_test(tst_qstatictext
     SOURCES
         tst_qstatictext.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qstatictext
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
+qt_extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
index c4ea8b4a1e..4c66cf94a7 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
+++ b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsyntaxhighlighter Test:
 #####################################################################
 
-add_qt_test(tst_qsyntaxhighlighter
+qt_add_test(tst_qsyntaxhighlighter
     SOURCES
         tst_qsyntaxhighlighter.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qsyntaxhighlighter
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextblock/CMakeLists.txt b/tests/auto/gui/text/qtextblock/CMakeLists.txt
index 18e0be18c6..c186fa8a75 100644
--- a/tests/auto/gui/text/qtextblock/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextblock/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextblock Test:
 #####################################################################
 
-add_qt_test(tst_qtextblock
+qt_add_test(tst_qtextblock
     SOURCES
         tst_qtextblock.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextcursor/CMakeLists.txt b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
index 78b6ed191d..2a48931662 100644
--- a/tests/auto/gui/text/qtextcursor/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextcursor Test:
 #####################################################################
 
-add_qt_test(tst_qtextcursor
+qt_add_test(tst_qtextcursor
     SOURCES
         tst_qtextcursor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextdocument/CMakeLists.txt b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
index 7ea22d3fb0..e99604e32a 100644
--- a/tests/auto/gui/text/qtextdocument/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocument Test:
 #####################################################################
 
-add_qt_test(tst_qtextdocument
+qt_add_test(tst_qtextdocument
     SOURCES
         common.h
         tst_qtextdocument.cpp
diff --git a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
index f92a82a262..03f36c3f6a 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocumentfragment Test:
 #####################################################################
 
-add_qt_test(tst_qtextdocumentfragment
+qt_add_test(tst_qtextdocumentfragment
     SOURCES
         tst_qtextdocumentfragment.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
index c7212209ee..11dda5929e 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextdocumentlayout Test:
 #####################################################################
 
-add_qt_test(tst_qtextdocumentlayout
+qt_add_test(tst_qtextdocumentlayout
     SOURCES
         tst_qtextdocumentlayout.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qtextdocumentlayout
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextformat/CMakeLists.txt b/tests/auto/gui/text/qtextformat/CMakeLists.txt
index be7653abd4..31320cd14b 100644
--- a/tests/auto/gui/text/qtextformat/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextformat/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextformat Test:
 #####################################################################
 
-add_qt_test(tst_qtextformat
+qt_add_test(tst_qtextformat
     SOURCES
         tst_qtextformat.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextlayout/CMakeLists.txt b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
index c87d5bdd4d..a899375497 100644
--- a/tests/auto/gui/text/qtextlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextlayout Test:
 #####################################################################
 
-add_qt_test(tst_qtextlayout
+qt_add_test(tst_qtextlayout
     SOURCES
         tst_qtextlayout.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextlist/CMakeLists.txt b/tests/auto/gui/text/qtextlist/CMakeLists.txt
index f22de38a8c..9ba6d82660 100644
--- a/tests/auto/gui/text/qtextlist/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextlist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextlist Test:
 #####################################################################
 
-add_qt_test(tst_qtextlist
+qt_add_test(tst_qtextlist
     SOURCES
         ../qtextdocument/common.h
         tst_qtextlist.cpp
diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
index 29cafad93f..eb5d34cbac 100644
--- a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND test_data "data/headingBulletsContinuations.md")
 list(APPEND test_data "data/fuzz20450.md")
 list(APPEND test_data "data/fuzz20580.md")
 
-add_qt_test(tst_qtextmarkdownimporter
+qt_add_test(tst_qtextmarkdownimporter
     SOURCES
         tst_qtextmarkdownimporter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
index 7360b40994..008f501e23 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "data/example.md")
 list(APPEND test_data "data/blockquotes.md")
 
-add_qt_test(tst_qtextmarkdownwriter
+qt_add_test(tst_qtextmarkdownwriter
     SOURCES
         tst_qtextmarkdownwriter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextobject/CMakeLists.txt b/tests/auto/gui/text/qtextobject/CMakeLists.txt
index b8d7f7b548..94cd60d6a6 100644
--- a/tests/auto/gui/text/qtextobject/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextobject Test:
 #####################################################################
 
-add_qt_test(tst_qtextobject
+qt_add_test(tst_qtextobject
     SOURCES
         tst_qtextobject.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qtextobject
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
index 18c84e5a45..70f73f0bad 100644
--- a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextodfwriter Test:
 #####################################################################
 
-add_qt_test(tst_qtextodfwriter
+qt_add_test(tst_qtextodfwriter
     SOURCES
         tst_qtextodfwriter.cpp
     DEFINES
diff --git a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
index 5fb8db5405..82861b9b8c 100644
--- a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 ## tst_qtextpiecetable Test:
 #####################################################################
 
-add_qt_test(tst_qtextpiecetable
+qt_add_test(tst_qtextpiecetable
     SOURCES
         ../qtextdocument/common.h
         tst_qtextpiecetable.cpp
diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
index 8d94e33b6c..8bd9909fe1 100644
--- a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtextscriptengine Test:
 #####################################################################
 
-add_qt_test(tst_qtextscriptengine
+qt_add_test(tst_qtextscriptengine
     SOURCES
         tst_qtextscriptengine.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
index b2434569d4..9bc97be6a3 100644
--- a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
+++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## generate Binary:
 #####################################################################
 
-add_qt_executable(generate
+qt_add_executable(generate
     GUI
     SOURCES
         main.cpp
diff --git a/tests/auto/gui/text/qtexttable/CMakeLists.txt b/tests/auto/gui/text/qtexttable/CMakeLists.txt
index de82c94233..036d39bbff 100644
--- a/tests/auto/gui/text/qtexttable/CMakeLists.txt
+++ b/tests/auto/gui/text/qtexttable/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtexttable Test:
 #####################################################################
 
-add_qt_test(tst_qtexttable
+qt_add_test(tst_qtexttable
     SOURCES
         tst_qtexttable.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ add_qt_test(tst_qtexttable
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt
index dfeb968cc1..02620d5e64 100644
--- a/tests/auto/gui/text/qzip/CMakeLists.txt
+++ b/tests/auto/gui/text/qzip/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "testdata")
 
-add_qt_test(tst_qzip
+qt_add_test(tst_qzip
     SOURCES
         tst_qzip.cpp
     PUBLIC_LIBRARIES
@@ -26,7 +26,7 @@ if(ANDROID)
         "testdata/test.zip"
     )
 
-    add_qt_resource(tst_qzip "testdata"
+    qt_add_resource(tst_qzip "testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
index 8163ec80b6..ce1db36f16 100644
--- a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
+++ b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdesktopservices Test:
 #####################################################################
 
-add_qt_test(tst_qdesktopservices
+qt_add_test(tst_qdesktopservices
     SOURCES
         tst_qdesktopservices.cpp
     DEFINES
diff --git a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
index c62cecac30..433e97414a 100644
--- a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
+++ b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdesktopservices Test:
 #####################################################################
 
-add_qt_test(tst_qdesktopservices
+qt_add_test(tst_qdesktopservices
     SOURCES
         tst_qdesktopservices.cpp
     DEFINES
diff --git a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
index 6cccd082a9..01ed8772ea 100644
--- a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdoublevalidator Test:
 #####################################################################
 
-add_qt_test(tst_qdoublevalidator
+qt_add_test(tst_qdoublevalidator
     SOURCES
         tst_qdoublevalidator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qintvalidator/CMakeLists.txt b/tests/auto/gui/util/qintvalidator/CMakeLists.txt
index 69a5503d8e..841fd02bb0 100644
--- a/tests/auto/gui/util/qintvalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qintvalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qintvalidator Test:
 #####################################################################
 
-add_qt_test(tst_qintvalidator
+qt_add_test(tst_qintvalidator
     SOURCES
         tst_qintvalidator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
index 8633a171e5..9a1491681e 100644
--- a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
+++ b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qregularexpressionvalidator Test:
 #####################################################################
 
-add_qt_test(tst_qregularexpressionvalidator
+qt_add_test(tst_qregularexpressionvalidator
     SOURCES
         tst_qregularexpressionvalidator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
index e9cb62377f..8a6f95da57 100644
--- a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadergenerator Test:
 #####################################################################
 
-add_qt_test(tst_qshadergenerator
+qt_add_test(tst_qshadergenerator
     SOURCES
         tst_qshadergenerator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergraph/CMakeLists.txt b/tests/auto/gui/util/qshadergraph/CMakeLists.txt
index ede24f2a40..f59e85af6c 100644
--- a/tests/auto/gui/util/qshadergraph/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergraph/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadergraph Test:
 #####################################################################
 
-add_qt_test(tst_qshadergraph
+qt_add_test(tst_qshadergraph
     SOURCES
         tst_qshadergraph.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
index caf863d42d..8e2b63213c 100644
--- a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadergraphloader Test:
 #####################################################################
 
-add_qt_test(tst_qshadergraphloader
+qt_add_test(tst_qshadergraphloader
     SOURCES
         tst_qshadergraphloader.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadernodes/CMakeLists.txt b/tests/auto/gui/util/qshadernodes/CMakeLists.txt
index d7cc14b09c..153e9fa09a 100644
--- a/tests/auto/gui/util/qshadernodes/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadernodes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadernodes Test:
 #####################################################################
 
-add_qt_test(tst_qshadernodes
+qt_add_test(tst_qshadernodes
     SOURCES
         tst_qshadernodes.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
index e381af4f7b..915e8b4a58 100644
--- a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
+++ b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qshadernodesloader Test:
 #####################################################################
 
-add_qt_test(tst_qshadernodesloader
+qt_add_test(tst_qshadernodesloader
     SOURCES
         tst_qshadernodesloader.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
index 3b6d99c0e8..23dc595d96 100644
--- a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
+++ b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtexturefilereader Test:
 #####################################################################
 
-add_qt_test(tst_qtexturefilereader
+qt_add_test(tst_qtexturefilereader
     SOURCES
         tst_qtexturefilereader.cpp
     PUBLIC_LIBRARIES
@@ -21,7 +21,7 @@ set(qtexturefilereader_resource_files
     "texturefiles/pattern.pkm"
 )
 
-add_qt_resource(tst_qtexturefilereader "qtexturefilereader"
+qt_add_resource(tst_qtexturefilereader "qtexturefilereader"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/gui/util/qundogroup/CMakeLists.txt b/tests/auto/gui/util/qundogroup/CMakeLists.txt
index 3325556a3e..9aa35ba9a7 100644
--- a/tests/auto/gui/util/qundogroup/CMakeLists.txt
+++ b/tests/auto/gui/util/qundogroup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qundogroup Test:
 #####################################################################
 
-add_qt_test(tst_qundogroup
+qt_add_test(tst_qundogroup
     SOURCES
         tst_qundogroup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/gui/util/qundostack/CMakeLists.txt b/tests/auto/gui/util/qundostack/CMakeLists.txt
index d6cf36187e..9e8ac65c97 100644
--- a/tests/auto/gui/util/qundostack/CMakeLists.txt
+++ b/tests/auto/gui/util/qundostack/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qundostack Test:
 #####################################################################
 
-add_qt_test(tst_qundostack
+qt_add_test(tst_qundostack
     SOURCES
         tst_qundostack.cpp
     PUBLIC_LIBRARIES