Regenerate all projects with new CMake API version

Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
author: Alexandru Croitor <alexandru.croitor@qt.io> 2019-11-14 13:31:06 +0100
committer: Alexandru Croitor <alexandru.croitor@qt.io> 2019-11-15 12:24:51 +0000
commit: ba494aaa24defe1401f621b791891e696b308756 (patch)
tree: 3617f29e9625fafbf94609ac79b2decd4033107c /tests/auto/qml
parent: 91e32f86b53bb930405a58e19c84746ee85cdf89 (diff)
154 files changed, 316 insertions, 316 deletions
diff --git a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
index 36b6c071dc..f6b8b2aa69 100644
--- a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractanimationjob Test:
 #####################################################################
 
-add_qt_test(tst_qabstractanimationjob
+qt_add_test(tst_qabstractanimationjob
     SOURCES
         tst_qabstractanimationjob.cpp
     LIBRARIES
diff --git a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
index c51fb2e754..d62512b489 100644
--- a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qanimationgroupjob Test:
 #####################################################################
 
-add_qt_test(tst_qanimationgroupjob
+qt_add_test(tst_qanimationgroupjob
     SOURCES
         tst_qanimationgroupjob.cpp
     LIBRARIES
diff --git a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
index 2b73283ad5..02fa824cd2 100644
--- a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qparallelanimationgroupjob Test:
 #####################################################################
 
-add_qt_test(tst_qparallelanimationgroupjob
+qt_add_test(tst_qparallelanimationgroupjob
     SOURCES
         tst_qparallelanimationgroupjob.cpp
     LIBRARIES
diff --git a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
index e5324af19d..e337d8aea9 100644
--- a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpauseanimationjob Test:
 #####################################################################
 
-add_qt_test(tst_qpauseanimationjob
+qt_add_test(tst_qpauseanimationjob
     SOURCES
         tst_qpauseanimationjob.cpp
     LIBRARIES
diff --git a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
index 7240f53dea..925f0c618b 100644
--- a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsequentialanimationgroupjob Test:
 #####################################################################
 
-add_qt_test(tst_qsequentialanimationgroupjob
+qt_add_test(tst_qsequentialanimationgroupjob
     SOURCES
         tst_qsequentialanimationgroupjob.cpp
     LIBRARIES
diff --git a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
index b214d50b7c..3f44aa3c0e 100644
--- a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
+++ b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_bindingdependencyapi
+qt_add_test(tst_bindingdependencyapi
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_bindingdependencyapi.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_bindingdependencyapi
 ## Scopes:
 #####################################################################
 
-extend_target(tst_bindingdependencyapi CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_bindingdependencyapi CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
index 343d75058f..1a28e73cea 100644
--- a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qdebugmessageservice
+qt_add_test(tst_qdebugmessageservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qdebugmessageservice
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qdebugmessageservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qdebugmessageservice CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
index d162ebc572..89e7b098bd 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpacketprotocol Test:
 #####################################################################
 
-add_qt_test(tst_qpacketprotocol
+qt_add_test(tst_qpacketprotocol
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -26,12 +26,12 @@ add_qt_test(tst_qpacketprotocol
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qpacketprotocol CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qpacketprotocol CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
index 76e0a404f3..578bc9bd21 100644
--- a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmldebugclient Test:
 #####################################################################
 
-add_qt_test(tst_qqmldebugclient
+qt_add_test(tst_qqmldebugclient
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmldebugclient
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmldebugclient CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugclient CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
index 8e26af3cd0..c90cc0e9de 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmldebuggingenabler Test:
 #####################################################################
 
-add_qt_test(tst_qqmldebuggingenabler
+qt_add_test(tst_qqmldebuggingenabler
     SOURCES
         ../../../../shared/util.cpp ../../../../shared/util.h
         ../../shared/debugutil.cpp ../../shared/debugutil_p.h
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmldebuggingenabler
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
index d5b3277b82..818e639fb5 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebuggingenablerserver Binary:
 #####################################################################
 
-add_qt_executable(qqmldebuggingenablerserver
+qt_add_executable(qqmldebuggingenablerserver
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebuggingenabler"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler"
     SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
index 070c2a78bf..16dfb7b494 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebuggingenablerserver Binary:
 #####################################################################
 
-add_qt_executable(qqmldebuggingenablerserver
+qt_add_executable(qqmldebuggingenablerserver
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler"
     # special case begin
     # Remove INSTALL_DIRECTORY with $$[QT_INSTALL_TESTS]
diff --git a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
index b20af4731b..4f9777eeba 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmldebugjs
+qt_add_test(tst_qqmldebugjs
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -35,12 +35,12 @@ add_qt_test(tst_qqmldebugjs
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmldebugjs CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugjs CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
index c7cbb71db7..7d82431f5d 100644
--- a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebugjsserver Binary:
 #####################################################################
 
-add_qt_executable(qqmldebugjsserver
+qt_add_executable(qqmldebugjsserver
     OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
     SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
index 85a682ff93..605ad3562e 100644
--- a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebugjsserver Binary:
 #####################################################################
 
-add_qt_executable(qqmldebugjsserver
+qt_add_executable(qqmldebugjsserver
     # special case begin
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     # INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
diff --git a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
index 27c968b5bb..791ea18adb 100644
--- a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmldebuglocal Test:
 #####################################################################
 
-add_qt_test(tst_qqmldebuglocal
+qt_add_test(tst_qqmldebuglocal
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -30,12 +30,12 @@ add_qt_test(tst_qqmldebuglocal
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmldebuglocal CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebuglocal CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
index bfa8ec10d3..a98a809c7b 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmldebugprocess Test:
 #####################################################################
 
-add_qt_test(tst_qqmldebugprocess
+qt_add_test(tst_qqmldebugprocess
     SOURCES
         ../../shared/qqmldebugprocess.cpp ../../shared/qqmldebugprocess_p.h
         tst_qqmldebugprocess.cpp
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
index 0f39b6c1c3..f5b04b18b5 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebugprocessprocess Binary:
 #####################################################################
 
-add_qt_executable(qqmldebugprocessprocess
+qt_add_executable(qqmldebugprocessprocess
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebugprocess"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess"
     SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
index c6e2aedb78..35e602d4f9 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qqmldebugprocessprocess Binary:
 #####################################################################
 
-add_qt_executable(qqmldebugprocessprocess
+qt_add_executable(qqmldebugprocessprocess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess"
 # special case begin
 # Remove INSTALL_DIRECTORY which starts with
diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
index b203440f1a..9b369053cc 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmldebugservice
+qt_add_test(tst_qqmldebugservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -40,12 +40,12 @@ add_qt_test(tst_qqmldebugservice
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmldebugservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugservice CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
index bf90555c47..a0f76b270a 100644
--- a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlenginecontrol
+qt_add_test(tst_qqmlenginecontrol
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -35,12 +35,12 @@ add_qt_test(tst_qqmlenginecontrol
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
index b4d382bb37..b8c377a268 100644
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlenginedebuginspectorintegration
+qt_add_test(tst_qqmlenginedebuginspectorintegration
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlenginedebuginspectorintegration
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
index 128ac8d0cb..6e54b5c7f5 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlenginedebugservice Test:
 #####################################################################
 
-add_qt_test(tst_qqmlenginedebugservice
+qt_add_test(tst_qqmlenginedebugservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -28,12 +28,12 @@ add_qt_test(tst_qqmlenginedebugservice
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
index 5220a77d41..822f59a2cb 100644
--- a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlinspector
+qt_add_test(tst_qqmlinspector
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlinspector
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlinspector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinspector CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
index 86722a769c..c818c158dc 100644
--- a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlnativeconnector Test:
 #####################################################################
 
-add_qt_test(tst_qqmlnativeconnector
+qt_add_test(tst_qqmlnativeconnector
     SOURCES
         tst_qqmlnativeconnector.cpp
     DEFINES
diff --git a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
index 4f2e3aafde..1d31348b6d 100644
--- a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND test_data "data/broken.qml")
 list(APPEND test_data "data/zoom.qml")
 list(APPEND test_data "data/i18n/qml_fr_FR.qm")
 
-add_qt_test(tst_qqmlpreview
+qt_add_test(tst_qqmlpreview
     SOURCES
         ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h
         ../../../shared/util.cpp ../../../shared/util.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qqmlpreview
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlpreview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpreview CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
index 8e5af6d4e7..c1c588b798 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlprofilerservice
+qt_add_test(tst_qqmlprofilerservice
     SOURCES
         ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -34,12 +34,12 @@ add_qt_test(tst_qqmlprofilerservice
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
index 9238e3c402..61ba310c9e 100644
--- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qv4debugger Test:
 #####################################################################
 
-add_qt_test(tst_qv4debugger
+qt_add_test(tst_qv4debugger
     SOURCES
         ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h
         ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
index c3b23fb30d..5ec6cb6257 100644
--- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
+++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qjstest Tool:
 #####################################################################
 
-add_qt_tool(qjstest
+qt_add_tool(qjstest
     SOURCES
         main.cpp
         test262runner.cpp test262runner.h
diff --git a/tests/auto/qml/parserstress/CMakeLists.txt b/tests/auto/qml/parserstress/CMakeLists.txt
index bf739790db..bbd29fa6a5 100644
--- a/tests/auto/qml/parserstress/CMakeLists.txt
+++ b/tests/auto/qml/parserstress/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     tests/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_parserstress
+qt_add_test(tst_parserstress
     SOURCES
         tst_parserstress.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt
index f3534f59dd..8e406e92ca 100644
--- a/tests/auto/qml/qjsengine/CMakeLists.txt
+++ b/tests/auto/qml/qjsengine/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     script/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qjsengine
+qt_add_test(tst_qjsengine
     SOURCES
         tst_qjsengine.cpp
     LIBRARIES
@@ -31,7 +31,7 @@ set(qjsengine_resource_files
     "translations/translatable_la.qm"
 )
 
-add_qt_resource(tst_qjsengine "qjsengine"
+qt_add_resource(tst_qjsengine "qjsengine"
     PREFIX
         "/"
     FILES
@@ -44,7 +44,7 @@ set(qmake_immediate_resource_files
     "testmodule.mjs"
 )
 
-add_qt_resource(tst_qjsengine "qmake_immediate"
+qt_add_resource(tst_qjsengine "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qjsonbinding/CMakeLists.txt b/tests/auto/qml/qjsonbinding/CMakeLists.txt
index bdd272fc30..ef9612d5db 100644
--- a/tests/auto/qml/qjsonbinding/CMakeLists.txt
+++ b/tests/auto/qml/qjsonbinding/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qjsonbinding
+qt_add_test(tst_qjsonbinding
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qjsonbinding.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qjsonbinding
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qjsonbinding CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qjsonbinding CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qjsvalue/CMakeLists.txt b/tests/auto/qml/qjsvalue/CMakeLists.txt
index 7f3b749aa4..43f4a0d543 100644
--- a/tests/auto/qml/qjsvalue/CMakeLists.txt
+++ b/tests/auto/qml/qjsvalue/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qjsvalue Test:
 #####################################################################
 
-add_qt_test(tst_qjsvalue
+qt_add_test(tst_qjsvalue
     SOURCES
         tst_qjsvalue.cpp tst_qjsvalue.h
     LIBRARIES
diff --git a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
index a347407f91..48edd77265 100644
--- a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
+++ b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qjsvalueiterator Test:
 #####################################################################
 
-add_qt_test(tst_qjsvalueiterator
+qt_add_test(tst_qjsvalueiterator
     SOURCES
         tst_qjsvalueiterator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt
index 7d61ab5893..fcd4be8633 100644
--- a/tests/auto/qml/qmlcachegen/CMakeLists.txt
+++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qmlcachegen
+qt_add_test(tst_qmlcachegen
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmlcachegen.cpp
@@ -31,7 +31,7 @@ set(qmake_workerscripts_test_resource_files
     "data/worker.qml"
 )
 
-add_qt_resource(tst_qmlcachegen "qmake_workerscripts_test"
+qt_add_resource(tst_qmlcachegen "qmake_workerscripts_test"
     PREFIX
         "/workerscripts"
     FILES
@@ -52,7 +52,7 @@ set(trickypaths_resource_files
     "data/versionStyleSuffix-1.2-more.qml"
 )
 
-add_qt_resource(tst_qmlcachegen "trickypaths"
+qt_add_resource(tst_qmlcachegen "trickypaths"
     PREFIX
         "/directory with spaces"
     FILES
@@ -65,7 +65,7 @@ set(retain_resource_files
     "Retain.qml"
 )
 
-add_qt_resource(tst_qmlcachegen "retain"
+qt_add_resource(tst_qmlcachegen "retain"
     PREFIX
         "/"
     BASE
@@ -86,7 +86,7 @@ set(qmake_immediate_resource_files
     "data/versionchecks.qml"
 )
 
-add_qt_resource(tst_qmlcachegen "qmake_immediate"
+qt_add_resource(tst_qmlcachegen "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -106,7 +106,7 @@ if(UNIX)
         "data/umlaut.qml"
     )
 
-    add_qt_resource(tst_qmlcachegen "trickypaths_umlaut"
+    qt_add_resource(tst_qmlcachegen "trickypaths_umlaut"
         PREFIX
             "/"
         FILES
@@ -114,12 +114,12 @@ if(UNIX)
     )
 endif()
 
-extend_target(tst_qmlcachegen CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qmlcachegen CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
index 927aa9f558..47bd9f64cd 100644
--- a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmldiskcache Test:
 #####################################################################
 
-add_qt_test(tst_qmldiskcache
+qt_add_test(tst_qmldiskcache
     SOURCES
         tst_qmldiskcache.cpp
     LIBRARIES
@@ -22,7 +22,7 @@ set(qmake_immediate_resource_files
     "test.qml"
 )
 
-add_qt_resource(tst_qmldiskcache "qmake_immediate"
+qt_add_resource(tst_qmldiskcache "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qmldiskcache/CMakeLists.txt b/tests/auto/qml/qmldiskcache/CMakeLists.txt
index 30019a8da8..2d46117815 100644
--- a/tests/auto/qml/qmldiskcache/CMakeLists.txt
+++ b/tests/auto/qml/qmldiskcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmldiskcache Test:
 #####################################################################
 
-add_qt_test(tst_qmldiskcache
+qt_add_test(tst_qmldiskcache
     SOURCES
         tst_qmldiskcache.cpp
     LIBRARIES
@@ -33,7 +33,7 @@ set(qmake_immediate_resource_files
     "test.qml"
 )
 
-add_qt_resource(tst_qmldiskcache "qmake_immediate"
+qt_add_resource(tst_qmldiskcache "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qmllint/CMakeLists.txt b/tests/auto/qml/qmllint/CMakeLists.txt
index a4bc65a0da..a6d1ada7ad 100644
--- a/tests/auto/qml/qmllint/CMakeLists.txt
+++ b/tests/auto/qml/qmllint/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qmllint
+qt_add_test(tst_qmllint
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qmllint.cpp
@@ -24,12 +24,12 @@ add_qt_test(tst_qmllint
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmllint CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qmllint CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmlmin/CMakeLists.txt b/tests/auto/qml/qmlmin/CMakeLists.txt
index 76bba7e42f..b1a8037cca 100644
--- a/tests/auto/qml/qmlmin/CMakeLists.txt
+++ b/tests/auto/qml/qmlmin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmlmin Test:
 #####################################################################
 
-add_qt_test(tst_qmlmin
+qt_add_test(tst_qmlmin
     SOURCES
         tst_qmlmin.cpp
     DEFINES
@@ -19,7 +19,7 @@ add_qt_test(tst_qmlmin
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmlmin CONDITION cross_compile AND NOT boot2qt
+qt_extend_target(tst_qmlmin CONDITION cross_compile AND NOT boot2qt
     DEFINES
         QTEST_CROSS_COMPILED
 )
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
index e8b5fb59ff..e8f6a9f7b7 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Dummy Generic Library:
 #####################################################################
 
-add_cmake_library(Dummy
+qt_add_cmake_library(Dummy
     MODULE
     SOURCES
         dummy.cpp dummy.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
index 2278a7423f..933b3f152e 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Dummy Generic Library:
 #####################################################################
 
-add_cmake_library(Dummy
+qt_add_cmake_library(Dummy
     MODULE
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
index b56eac2165..993c3e19e6 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## ExtendedType Generic Library:
 #####################################################################
 
-add_cmake_library(ExtendedType
+qt_add_cmake_library(ExtendedType
     MODULE
     SOURCES
         plugin.cpp plugin.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
index 11ac920aeb..9e934eff60 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## ExtendedType Generic Library:
 #####################################################################
 
-add_cmake_library(ExtendedType
+qt_add_cmake_library(ExtendedType
     MODULE
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
index 89079d0e0e..aeb3308336 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Imports Generic Library:
 #####################################################################
 
-add_cmake_library(Imports
+qt_add_cmake_library(Imports
     MODULE
     SOURCES
         imports.cpp imports.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
index 611842f9a3..cf776a58ff 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Imports Generic Library:
 #####################################################################
 
-add_cmake_library(Imports
+qt_add_cmake_library(Imports
     MODULE
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
index e29fe730f5..2edf46a96a 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Versions Generic Library:
 #####################################################################
 
-add_cmake_library(Versions
+qt_add_cmake_library(Versions
     MODULE
     SOURCES
         versions.cpp versions.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
index 3b3a6eb77b..950ffda821 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Versions Generic Library:
 #####################################################################
 
-add_cmake_library(Versions
+qt_add_cmake_library(Versions
     MODULE
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
index 95a2659ec8..b97251f0b8 100644
--- a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
+++ b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testapp Binary:
 #####################################################################
 
-add_qt_executable(testapp
+qt_add_executable(testapp
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
@@ -21,7 +21,7 @@ set(main_resource_files
     "immediateQuit.qml"
 )
 
-add_qt_resource(testapp "main"
+qt_add_resource(testapp "main"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qqmlbinding/CMakeLists.txt b/tests/auto/qml/qqmlbinding/CMakeLists.txt
index 3ebbbd46b1..d4ac2e7dad 100644
--- a/tests/auto/qml/qqmlbinding/CMakeLists.txt
+++ b/tests/auto/qml/qqmlbinding/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlbinding
+qt_add_test(tst_qqmlbinding
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlbinding.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlbinding
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlbinding CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlbinding CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlchangeset/CMakeLists.txt b/tests/auto/qml/qqmlchangeset/CMakeLists.txt
index ad688cd556..c8da32eff8 100644
--- a/tests/auto/qml/qqmlchangeset/CMakeLists.txt
+++ b/tests/auto/qml/qqmlchangeset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlhangeset Test:
 #####################################################################
 
-add_qt_test(tst_qqmlhangeset
+qt_add_test(tst_qqmlhangeset
     SOURCES
         tst_qqmlchangeset.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt
index 0ee7103dc6..41f844d369 100644
--- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlcomponent
+qt_add_test(tst_qqmlcomponent
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -35,7 +35,7 @@ set(qmake_immediate_resource_files
     "data/QtObjectComponent.qml"
 )
 
-add_qt_resource(tst_qqmlcomponent "qmake_immediate"
+qt_add_resource(tst_qqmlcomponent "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -46,12 +46,12 @@ add_qt_resource(tst_qqmlcomponent "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlcomponent CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlcomponent CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlconnections/CMakeLists.txt b/tests/auto/qml/qqmlconnections/CMakeLists.txt
index 5874b19fbf..22f2a86278 100644
--- a/tests/auto/qml/qqmlconnections/CMakeLists.txt
+++ b/tests/auto/qml/qqmlconnections/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlconnections
+qt_add_test(tst_qqmlconnections
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlconnections.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlconnections
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlconnections CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlconnections CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlconsole/CMakeLists.txt b/tests/auto/qml/qqmlconsole/CMakeLists.txt
index dd9fea6721..25c726e8fd 100644
--- a/tests/auto/qml/qqmlconsole/CMakeLists.txt
+++ b/tests/auto/qml/qqmlconsole/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlconsole
+qt_add_test(tst_qqmlconsole
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlconsole.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qqmlconsole
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlconsole CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlconsole CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlcontext/CMakeLists.txt b/tests/auto/qml/qqmlcontext/CMakeLists.txt
index 741bfec4c0..a3c08a67f7 100644
--- a/tests/auto/qml/qqmlcontext/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcontext/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlcontext
+qt_add_test(tst_qqmlcontext
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlcontext.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlcontext
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlcontext CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlcontext CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlcpputils/CMakeLists.txt b/tests/auto/qml/qqmlcpputils/CMakeLists.txt
index 1c8bb7fca8..8b12231c2a 100644
--- a/tests/auto/qml/qqmlcpputils/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcpputils/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlcpputils Test:
 #####################################################################
 
-add_qt_test(tst_qqmlcpputils
+qt_add_test(tst_qqmlcpputils
     SOURCES
         tst_qqmlcpputils.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qqmldirparser/CMakeLists.txt b/tests/auto/qml/qqmldirparser/CMakeLists.txt
index 73ac9f64e4..9a408dfd4a 100644
--- a/tests/auto/qml/qqmldirparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmldirparser/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmldirparser
+qt_add_test(tst_qqmldirparser
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmldirparser.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qqmldirparser
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmldirparser CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldirparser CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
index 57e1930778..8c57d85eb7 100644
--- a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlecmascript
+qt_add_test(tst_qqmlecmascript
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -37,7 +37,7 @@ set(qqmlecmascript_resource_files
     "data/js/include3.js"
 )
 
-add_qt_resource(tst_qqmlecmascript "qqmlecmascript"
+qt_add_resource(tst_qqmlecmascript "qqmlecmascript"
     PREFIX
         "/"
     FILES
@@ -48,17 +48,17 @@ add_qt_resource(tst_qqmlecmascript "qqmlecmascript"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlecmascript/CMakeLists.txt b/tests/auto/qml/qqmlecmascript/CMakeLists.txt
index d467791e87..72ec67ba9f 100644
--- a/tests/auto/qml/qqmlecmascript/CMakeLists.txt
+++ b/tests/auto/qml/qqmlecmascript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlecmascript
+qt_add_test(tst_qqmlecmascript
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -44,7 +44,7 @@ set_source_files_properties(
         QT_SKIP_QUICKCOMPILER 1)
 # special case end
 
-add_qt_resource(tst_qqmlecmascript "qqmlecmascript"
+qt_add_resource(tst_qqmlecmascript "qqmlecmascript"
     PREFIX
         "/"
     FILES
@@ -55,17 +55,17 @@ add_qt_resource(tst_qqmlecmascript "qqmlecmascript"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlengine/CMakeLists.txt b/tests/auto/qml/qqmlengine/CMakeLists.txt
index dff90d6c3b..0c87451873 100644
--- a/tests/auto/qml/qqmlengine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlengine/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlengine
+qt_add_test(tst_qqmlengine
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlengine.cpp
@@ -33,7 +33,7 @@ set(qmake_immediate_resource_files
     "data/qrcurls.qml"
 )
 
-add_qt_resource(tst_qqmlengine "qmake_immediate"
+qt_add_resource(tst_qqmlengine "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -44,17 +44,17 @@ add_qt_resource(tst_qqmlengine "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlengine CONDITION boot2qt
+qt_extend_target(tst_qqmlengine CONDITION boot2qt
     DEFINES
         SKIP_GCCORRUPTION_TEST
 )
 
-extend_target(tst_qqmlengine CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlengine CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
index dd5b120560..3dad2d2ce9 100644
--- a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlenginecleanup Test:
 #####################################################################
 
-add_qt_test(tst_qqmlenginecleanup
+qt_add_test(tst_qqmlenginecleanup
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlenginecleanup.cpp
@@ -20,12 +20,12 @@ add_qt_test(tst_qqmlenginecleanup
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
index a96db2a535..f16ce3e6c3 100644
--- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## CustomModule Generic Library:
 #####################################################################
 
-add_cmake_library(CustomModule
+qt_add_cmake_library(CustomModule
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule"
     SOURCES
         moduleplugin.cpp
@@ -20,7 +20,7 @@ set(moduleplugin_resource_files
     "ModuleType.qml"
 )
 
-add_qt_resource(CustomModule "moduleplugin"
+qt_add_resource(CustomModule "moduleplugin"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
index f8a7a5ed93..f98f97cf81 100644
--- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## CustomModule Generic Library:
 #####################################################################
 
-add_cmake_library(CustomModule
+qt_add_cmake_library(CustomModule
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule"
     SOURCES
         moduleplugin.cpp
@@ -20,7 +20,7 @@ set(moduleplugin_resource_files
     "ModuleType.qml"
 )
 
-add_qt_resource(CustomModule "moduleplugin"
+qt_add_resource(CustomModule "moduleplugin"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qml/qqmlerror/CMakeLists.txt b/tests/auto/qml/qqmlerror/CMakeLists.txt
index f0b3407a39..a63125137b 100644
--- a/tests/auto/qml/qqmlerror/CMakeLists.txt
+++ b/tests/auto/qml/qqmlerror/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlerror
+qt_add_test(tst_qqmlerror
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlerror.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlerror
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlerror CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlerror CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlexpression/CMakeLists.txt b/tests/auto/qml/qqmlexpression/CMakeLists.txt
index e331e5435e..39ded1e25d 100644
--- a/tests/auto/qml/qqmlexpression/CMakeLists.txt
+++ b/tests/auto/qml/qqmlexpression/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlexpression
+qt_add_test(tst_qqmlexpression
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlexpression.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlexpression
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlexpression CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlexpression CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
index 6d5bc136cc..d0716ed8ff 100644
--- a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlextensionplugin Test:
 #####################################################################
 
-add_qt_test(tst_qqmlextensionplugin
+qt_add_test(tst_qqmlextensionplugin
     SOURCES
         tst_qqmlextensionplugin.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlfile/CMakeLists.txt b/tests/auto/qml/qqmlfile/CMakeLists.txt
index f1babe3e02..2a0fa63bb8 100644
--- a/tests/auto/qml/qqmlfile/CMakeLists.txt
+++ b/tests/auto/qml/qqmlfile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlfile Test:
 #####################################################################
 
-add_qt_test(tst_qqmlfile
+qt_add_test(tst_qqmlfile
     SOURCES
         tst_qqmlfile.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlfileselector/CMakeLists.txt b/tests/auto/qml/qqmlfileselector/CMakeLists.txt
index 1ef35f88b3..4b85b1c94b 100644
--- a/tests/auto/qml/qqmlfileselector/CMakeLists.txt
+++ b/tests/auto/qml/qqmlfileselector/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlfileselector
+qt_add_test(tst_qqmlfileselector
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlfileselector.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlfileselector
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlfileselector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlfileselector CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlglobal/CMakeLists.txt b/tests/auto/qml/qqmlglobal/CMakeLists.txt
index 54986b5e80..fa6832b178 100644
--- a/tests/auto/qml/qqmlglobal/CMakeLists.txt
+++ b/tests/auto/qml/qqmlglobal/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlglobal Test:
 #####################################################################
 
-add_qt_test(tst_qqmlglobal
+qt_add_test(tst_qqmlglobal
     SOURCES
         tst_qqmlglobal.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qqmlimport/CMakeLists.txt b/tests/auto/qml/qqmlimport/CMakeLists.txt
index f81706365f..b965a224c6 100644
--- a/tests/auto/qml/qqmlimport/CMakeLists.txt
+++ b/tests/auto/qml/qqmlimport/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
     FormFromQmlDir/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlimport
+qt_add_test(tst_qqmlimport
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlimport.cpp
@@ -40,12 +40,12 @@ add_qt_test(tst_qqmlimport
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlimport CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlimport CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlincubator/CMakeLists.txt b/tests/auto/qml/qqmlincubator/CMakeLists.txt
index 6ceddbd357..a2feb956dc 100644
--- a/tests/auto/qml/qqmlincubator/CMakeLists.txt
+++ b/tests/auto/qml/qqmlincubator/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlincubator
+qt_add_test(tst_qqmlincubator
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         testtypes.cpp testtypes.h
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlincubator
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlincubator CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlincubator CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlinfo/CMakeLists.txt b/tests/auto/qml/qqmlinfo/CMakeLists.txt
index a852cce2a0..d6e345a859 100644
--- a/tests/auto/qml/qqmlinfo/CMakeLists.txt
+++ b/tests/auto/qml/qqmlinfo/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlinfo
+qt_add_test(tst_qqmlinfo
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlinfo.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlinfo
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlinfo CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinfo CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
index dbf8c2e35e..3503458a9a 100644
--- a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
+++ b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlinstantiator
+qt_add_test(tst_qqmlinstantiator
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         stringmodel.h
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlinstantiator
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlinstantiator CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinstantiator CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
index 988ffc9599..4b2a94a7d1 100644
--- a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
+++ b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlitemmodels
+qt_add_test(tst_qqmlitemmodels
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         qtestmodel.h
@@ -30,12 +30,12 @@ add_qt_test(tst_qqmlitemmodels
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlitemmodels CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlitemmodels CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt
index c520d48972..eec5b82607 100644
--- a/tests/auto/qml/qqmllanguage/CMakeLists.txt
+++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmllanguage
+qt_add_test(tst_qqmllanguage
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -44,7 +44,7 @@ if(ANDROID)
         "data/I18nType30.qml"
     )
 
-    add_qt_resource(tst_qqmllanguage "qqmllanguage"
+    qt_add_resource(tst_qqmllanguage "qqmllanguage"
         PREFIX
             "/"
         FILES
@@ -52,12 +52,12 @@ if(ANDROID)
     )
 endif()
 
-extend_target(tst_qqmllanguage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllanguage CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
index 7c6c8145c6..49859e70f2 100644
--- a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmllistcompositor Test:
 #####################################################################
 
-add_qt_test(tst_qqmllistcompositor
+qt_add_test(tst_qqmllistcompositor
     SOURCES
         tst_qqmllistcompositor.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qqmllistmodel/CMakeLists.txt b/tests/auto/qml/qqmllistmodel/CMakeLists.txt
index 407ca10381..44589cbc76 100644
--- a/tests/auto/qml/qqmllistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistmodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmllistmodel
+qt_add_test(tst_qqmllistmodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmllistmodel.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qqmllistmodel
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmllistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistmodel CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
index f36bcceeb2..2e689e0afe 100644
--- a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmllistmodelworkerscript
+qt_add_test(tst_qqmllistmodelworkerscript
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmllistmodelworkerscript.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qqmllistmodelworkerscript
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistreference/CMakeLists.txt b/tests/auto/qml/qqmllistreference/CMakeLists.txt
index 7357a030ce..0dc3394971 100644
--- a/tests/auto/qml/qqmllistreference/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistreference/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmllistreference
+qt_add_test(tst_qqmllistreference
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmllistreference.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmllistreference
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmllistreference CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistreference CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllocale/CMakeLists.txt b/tests/auto/qml/qqmllocale/CMakeLists.txt
index 13bfd08505..139582c1a7 100644
--- a/tests/auto/qml/qqmllocale/CMakeLists.txt
+++ b/tests/auto/qml/qqmllocale/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmllocale
+qt_add_test(tst_qqmllocale
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmllocale.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qqmllocale
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmllocale CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllocale CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
index 02d18c9eb5..2ca7b78d11 100644
--- a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlmetaobject
+qt_add_test(tst_qqmlmetaobject
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlmetaobject.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qqmlmetaobject
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlmetaobject CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlmetaobject CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
index 38d3034509..1f22d176f9 100644
--- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlmetatype
+qt_add_test(tst_qqmlmetatype
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlmetatype.cpp
@@ -31,7 +31,7 @@ set(qmake_qmlfiles_resource_files
     "data/CompositeType.qml"
 )
 
-add_qt_resource(tst_qqmlmetatype "qmake_qmlfiles"
+qt_add_resource(tst_qqmlmetatype "qmake_qmlfiles"
     PREFIX
         "/tstqqmlmetatype"
     FILES
@@ -43,7 +43,7 @@ set(qmake_qmldirresource_resource_files
     "data/enumsInRecursiveImport.qml"
 )
 
-add_qt_resource(tst_qqmlmetatype "qmake_qmldirresource"
+qt_add_resource(tst_qqmlmetatype "qmake_qmldirresource"
     PREFIX
         "/"
     FILES
@@ -54,12 +54,12 @@ add_qt_resource(tst_qqmlmetatype "qmake_qmldirresource"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlmetatype CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlmetatype CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
index 7d96a54a8e..d03442b163 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidFirstCommandModule Generic Library:
 #####################################################################
 
-add_cmake_library(invalidFirstCommandModule
+qt_add_cmake_library(invalidFirstCommandModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
index 3f318abfc3..6bb1cbb689 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidFirstCommandModule Generic Library:
 #####################################################################
 
-add_cmake_library(invalidFirstCommandModule
+qt_add_cmake_library(invalidFirstCommandModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
index 58c1347556..bf9ed44b68 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidNamespaceModule Generic Library:
 #####################################################################
 
-add_cmake_library(invalidNamespaceModule
+qt_add_cmake_library(invalidNamespaceModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
index 3ec16a1007..416916a9c8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## invalidNamespaceModule Generic Library:
 #####################################################################
 
-add_cmake_library(invalidNamespaceModule
+qt_add_cmake_library(invalidNamespaceModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
index 01d30f29a1..59bc23604e 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nestedPlugin Generic Library:
 #####################################################################
 
-add_cmake_library(nestedPlugin
+qt_add_cmake_library(nestedPlugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType"
     SOURCES
         nestedPlugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
index b925765217..ea035b9815 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nestedPlugin Generic Library:
 #####################################################################
 
-add_cmake_library(nestedPlugin
+qt_add_cmake_library(nestedPlugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType"
     SOURCES
         nestedPlugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
index f055b4d374..793ef68eb8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nonstrictModule Generic Library:
 #####################################################################
 
-add_cmake_library(nonstrictModule
+qt_add_cmake_library(nonstrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
index 32b4393d71..6739b18c53 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## nonstrictModule Generic Library:
 #####################################################################
 
-add_cmake_library(nonstrictModule
+qt_add_cmake_library(nonstrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt
index bd8c267456..0ace521a5d 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2.1 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2.1
+qt_add_cmake_library(plugin.2.1
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
index c33407a619..5f008737f7 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2.1 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2.1
+qt_add_cmake_library(plugin.2.1
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt
index fa11a4f0dc..caa119c2d3 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt
index 61ab84a7f6..8cb9cc3740 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin.2.1 # special case
+qt_add_cmake_library(childplugin.2.1 # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt
index 9bb54a6baf..8d344ca55a 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2.2 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2.2
+qt_add_cmake_library(plugin.2.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
index f5e24fa991..48ebf86a07 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2.2 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2.2
+qt_add_cmake_library(plugin.2.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
index 9cd696fa03..ece805b2a8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2
+qt_add_cmake_library(plugin.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
index aafa7fd17e..c1827202e0 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin.2 Generic Library:
 #####################################################################
 
-add_cmake_library(plugin.2
+qt_add_cmake_library(plugin.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt
index 24c06ade06..7446fa49c3 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
index d4d64577ce..ebf8b65f38 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin.2 # special case
+qt_add_cmake_library(childplugin.2 # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
index ecd463389b..f9f5f1ea92 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin Generic Library:
 #####################################################################
 
-add_cmake_library(plugin
+qt_add_cmake_library(plugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
index 3d9f1e6da2..ced3e394bc 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## plugin Generic Library:
 #####################################################################
 
-add_cmake_library(plugin
+qt_add_cmake_library(plugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
index 2037c70f28..ff70bc3f61 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
index eb3964a0c3..0490d76d80 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## childplugin Generic Library:
 #####################################################################
 
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin"
     SOURCES
         childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
index 2cf70361dc..651a4e124b 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginMixed Generic Library:
 #####################################################################
 
-add_cmake_library(pluginMixed
+qt_add_cmake_library(pluginMixed
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
index ce2b0a7cf0..a31f9d7a91 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginMixed Generic Library:
 #####################################################################
 
-add_cmake_library(pluginMixed
+qt_add_cmake_library(pluginMixed
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
index b5ea40704a..fe49c797b4 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginVersion Generic Library:
 #####################################################################
 
-add_cmake_library(pluginVersion
+qt_add_cmake_library(pluginVersion
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
index b3f448f669..2c7d69e408 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginVersion Generic Library:
 #####################################################################
 
-add_cmake_library(pluginVersion
+qt_add_cmake_library(pluginVersion
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
index 5cf3bde36d..825d30bea9 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginWithQmlFile Generic Library:
 #####################################################################
 
-add_cmake_library(pluginWithQmlFile
+qt_add_cmake_library(pluginWithQmlFile
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
index 7cb468c169..29fa258de8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## pluginWithQmlFile Generic Library:
 #####################################################################
 
-add_cmake_library(pluginWithQmlFile
+qt_add_cmake_library(pluginWithQmlFile
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
index 0a8844b169..94e7013e32 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Plugin Generic Library:
 #####################################################################
 
-add_cmake_library(Plugin
+qt_add_cmake_library(Plugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
index 8ceb2efa99..b14b40fd78 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Plugin Generic Library:
 #####################################################################
 
-add_cmake_library(Plugin
+qt_add_cmake_library(Plugin
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
index dd74064201..9b37de6443 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptedStrictModule Generic Library:
 #####################################################################
 
-add_cmake_library(preemptedStrictModule
+qt_add_cmake_library(preemptedStrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
index fe4517571a..7068f51f03 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptedStrictModule Generic Library:
 #####################################################################
 
-add_cmake_library(preemptedStrictModule
+qt_add_cmake_library(preemptedStrictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
index a436682442..5ed3768a75 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptiveModule Generic Library:
 #####################################################################
 
-add_cmake_library(preemptiveModule
+qt_add_cmake_library(preemptiveModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
index c2510ec868..7e8b4d0739 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## preemptiveModule Generic Library:
 #####################################################################
 
-add_cmake_library(preemptiveModule
+qt_add_cmake_library(preemptiveModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
index dfd26339ee..65b4d1bc40 100644
--- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## protectedModule Generic Library:
 #####################################################################
 
-add_cmake_library(protectedModule
+qt_add_cmake_library(protectedModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
index 8522d435b2..be50685c09 100644
--- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## protectedModule Generic Library:
 #####################################################################
 
-add_cmake_library(protectedModule
+qt_add_cmake_library(protectedModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
index ee29087a5d..d57f762100 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule.2 Generic Library:
 #####################################################################
 
-add_cmake_library(strictModule.2
+qt_add_cmake_library(strictModule.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
index 6a5aecfc1f..6229b9efaf 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule.2 Generic Library:
 #####################################################################
 
-add_cmake_library(strictModule.2
+qt_add_cmake_library(strictModule.2
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
index 299812ecdb..d76e1600ae 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule Generic Library:
 #####################################################################
 
-add_cmake_library(strictModule
+qt_add_cmake_library(strictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
index 690ab0b48b..4a5a79be4d 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## strictModule Generic Library:
 #####################################################################
 
-add_cmake_library(strictModule
+qt_add_cmake_library(strictModule
     MODULE
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule"
     SOURCES
diff --git a/tests/auto/qml/qqmlnotifier/CMakeLists.txt b/tests/auto/qml/qqmlnotifier/CMakeLists.txt
index 543e9e1ea3..5756cb353d 100644
--- a/tests/auto/qml/qqmlnotifier/CMakeLists.txt
+++ b/tests/auto/qml/qqmlnotifier/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlnotifier
+qt_add_test(tst_qqmlnotifier
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlnotifier.cpp
@@ -25,12 +25,12 @@ add_qt_test(tst_qqmlnotifier
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlnotifier CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlnotifier CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
index fa4e9c5913..6be3149ccb 100644
--- a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlobjectmodel Test:
 #####################################################################
 
-add_qt_test(tst_qqmlobjectmodel
+qt_add_test(tst_qqmlobjectmodel
     SOURCES
         tst_qqmlobjectmodel.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
index 8920bd8528..b20b8363e3 100644
--- a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
+++ b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlopenmetaobject Test:
 #####################################################################
 
-add_qt_test(tst_qqmlopenmetaobject
+qt_add_test(tst_qqmlopenmetaobject
     SOURCES
         tst_qqmlopenmetaobject.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt
index 7c327dcfca..074e979d86 100644
--- a/tests/auto/qml/qqmlparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmlparser/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlparser
+qt_add_test(tst_qqmlparser
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlparser.cpp
@@ -29,17 +29,17 @@ add_qt_test(tst_qqmlparser
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlparser CONDITION cross_compile
+qt_extend_target(tst_qqmlparser CONDITION cross_compile
     DEFINES
         QTEST_CROSS_COMPILED
 )
 
-extend_target(tst_qqmlparser CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlparser CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpromise/CMakeLists.txt b/tests/auto/qml/qqmlpromise/CMakeLists.txt
index 9f8b4ef1c2..06cbfdf714 100644
--- a/tests/auto/qml/qqmlpromise/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpromise/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlpromise
+qt_add_test(tst_qqmlpromise
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlpromise.cpp
@@ -35,12 +35,12 @@ add_qt_test(tst_qqmlpromise
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlpromise CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpromise CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt
index f34d6c372f..0bb6c9e2e7 100644
--- a/tests/auto/qml/qqmlproperty/CMakeLists.txt
+++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlproperty
+qt_add_test(tst_qqmlproperty
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlproperty.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlproperty
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlproperty CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlproperty CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
index b5ae21f026..5666ca191c 100644
--- a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlpropertycache
+qt_add_test(tst_qqmlpropertycache
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlpropertycache.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlpropertycache
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlpropertycache CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpropertycache CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
index 2daf727a5c..b388266e88 100644
--- a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlpropertymap
+qt_add_test(tst_qqmlpropertymap
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlpropertymap.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlpropertymap
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlpropertymap CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpropertymap CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlqt/CMakeLists.txt b/tests/auto/qml/qqmlqt/CMakeLists.txt
index e6b835d89a..e81e9cba58 100644
--- a/tests/auto/qml/qqmlqt/CMakeLists.txt
+++ b/tests/auto/qml/qqmlqt/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlqt
+qt_add_test(tst_qqmlqt
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlqt.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlqt
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlqt CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlqt CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlsettings/CMakeLists.txt b/tests/auto/qml/qqmlsettings/CMakeLists.txt
index cf0628867c..6463c414d0 100644
--- a/tests/auto/qml/qqmlsettings/CMakeLists.txt
+++ b/tests/auto/qml/qqmlsettings/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlsettings
+qt_add_test(tst_qqmlsettings
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlsettings.cpp
@@ -25,12 +25,12 @@ add_qt_test(tst_qqmlsettings
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlsettings CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlsettings CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
index c064f18280..23b57c97fb 100644
--- a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
+++ b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlsqldatabase
+qt_add_test(tst_qqmlsqldatabase
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlsqldatabase.cpp
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlsqldatabase
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
index fb546bfdb5..dc954aea26 100644
--- a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmlstatemachine Test:
 #####################################################################
 
-add_qt_test(tst_qqmlstatemachine
+qt_add_test(tst_qqmlstatemachine
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmlstatemachine.cpp
@@ -24,12 +24,12 @@ add_qt_test(tst_qqmlstatemachine
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlstatemachine CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlstatemachine CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlstatemachine CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlstatemachine CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltablemodel/CMakeLists.txt b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
index 88c35aa111..519f3334ad 100644
--- a/tests/auto/qml/qqmltablemodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmltablemodel
+qt_add_test(tst_qqmltablemodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmltablemodel.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmltablemodel
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmltablemodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltablemodel CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltimer/CMakeLists.txt b/tests/auto/qml/qqmltimer/CMakeLists.txt
index 0a8982d1c6..eadc846d71 100644
--- a/tests/auto/qml/qqmltimer/CMakeLists.txt
+++ b/tests/auto/qml/qqmltimer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qqmltimer Test:
 #####################################################################
 
-add_qt_test(tst_qqmltimer
+qt_add_test(tst_qqmltimer
     SOURCES
         tst_qqmltimer.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
index 968b04f6ae..d835cf8773 100644
--- a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmltranslation
+qt_add_test(tst_qqmltranslation
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmltranslation.cpp
@@ -32,7 +32,7 @@ set(translation_resource_files
     "translation.qml"
 )
 
-add_qt_resource(tst_qqmltranslation "translation"
+qt_add_resource(tst_qqmltranslation "translation"
     PREFIX
         "/"
     BASE
@@ -45,12 +45,12 @@ add_qt_resource(tst_qqmltranslation "translation"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt
index e6488e42dc..45fc4c234f 100644
--- a/tests/auto/qml/qqmltranslation/CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmltranslation
+qt_add_test(tst_qqmltranslation
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qqmltranslation.cpp
@@ -46,7 +46,7 @@ set_source_files_properties(
 )
 # special case end
 
-add_qt_resource(tst_qqmltranslation "translation"
+qt_add_resource(tst_qqmltranslation "translation"
     PREFIX
         "/"
     BASE
@@ -59,12 +59,12 @@ add_qt_resource(tst_qqmltranslation "translation"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
index 512adcf953..8e71ea4315 100644
--- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmltypeloader
+qt_add_test(tst_qqmltypeloader
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmltypeloader
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmltypeloader CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltypeloader CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
index 5951b4e84c..7dd4bb659c 100644
--- a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Slow Generic Library:
 #####################################################################
 
-add_cmake_library(Slow
+qt_add_cmake_library(Slow
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow"
     SOURCES
         plugin.cpp plugin.h
diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
index 89aaa009ab..c377016682 100644
--- a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Slow Generic Library:
 #####################################################################
 
-add_cmake_library(Slow
+qt_add_cmake_library(Slow
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow"
     SOURCES
         plugin.cpp plugin.h
diff --git a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
index 0b34b211a3..c11d932c65 100644
--- a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
+++ b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlvaluetypeproviders
+qt_add_test(tst_qqmlvaluetypeproviders
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         testtypes.cpp testtypes.h
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlvaluetypeproviders
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
index 22cec428d6..ce5ff68040 100644
--- a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
+++ b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlvaluetypes
+qt_add_test(tst_qqmlvaluetypes
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         testtypes.cpp testtypes.h
@@ -35,12 +35,12 @@ add_qt_test(tst_qqmlvaluetypes
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
index f5928edd4e..547f323190 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
+++ b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qqmlxmlhttprequest
+qt_add_test(tst_qqmlxmlhttprequest
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlxmlhttprequest
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
index db4af83706..eee005c48a 100644
--- a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickfolderlistmodel
+qt_add_test(tst_qquickfolderlistmodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickfolderlistmodel.cpp
@@ -31,7 +31,7 @@ set(introspect_resource_files
     "txtdir/hello.txt"
 )
 
-add_qt_resource(tst_qquickfolderlistmodel "introspect"
+qt_add_resource(tst_qquickfolderlistmodel "introspect"
     PREFIX
         "/myprefix/subdir"
     BASE
@@ -44,12 +44,12 @@ add_qt_resource(tst_qquickfolderlistmodel "introspect"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
index 0d7a3f4df9..5938a36f6f 100644
--- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickfolderlistmodel
+qt_add_test(tst_qquickfolderlistmodel
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickfolderlistmodel.cpp
@@ -34,7 +34,7 @@ set(introspect_resource_files
     "txtdir/hello.txt"
 )
 
-add_qt_resource(tst_qquickfolderlistmodel "introspect"
+qt_add_resource(tst_qquickfolderlistmodel "introspect"
     PREFIX
         "/myprefix/subdir"
     BASE
@@ -47,12 +47,12 @@ add_qt_resource(tst_qquickfolderlistmodel "introspect"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickworkerscript/CMakeLists.txt b/tests/auto/qml/qquickworkerscript/CMakeLists.txt
index 08f223d763..511144c6af 100644
--- a/tests/auto/qml/qquickworkerscript/CMakeLists.txt
+++ b/tests/auto/qml/qquickworkerscript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickworkerscript
+qt_add_test(tst_qquickworkerscript
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qquickworkerscript.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qquickworkerscript
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickworkerscript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickworkerscript CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qrcqml/CMakeLists.txt b/tests/auto/qml/qrcqml/CMakeLists.txt
index e2401230e5..88e910ba05 100644
--- a/tests/auto/qml/qrcqml/CMakeLists.txt
+++ b/tests/auto/qml/qrcqml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qrcqml Test:
 #####################################################################
 
-add_qt_test(tst_qrcqml
+qt_add_test(tst_qrcqml
     SOURCES
         tst_qrcqml.cpp
     PUBLIC_LIBRARIES
@@ -31,7 +31,7 @@ set(qrcqml_resource_files
     "data/main2.qml"
 )
 
-add_qt_resource(tst_qrcqml "qrcqml"
+qt_add_resource(tst_qrcqml "qrcqml"
     PREFIX
         "/"
     FILES
@@ -48,7 +48,7 @@ set(qrcqml1_resource_files
     "data/main3.qml"
 )
 
-add_qt_resource(tst_qrcqml "qrcqml1"
+qt_add_resource(tst_qrcqml "qrcqml1"
     PREFIX
         "/search"
     FILES
@@ -61,7 +61,7 @@ set(qrcqml2_resource_files
     "data/SubDir.qml"
 )
 
-add_qt_resource(tst_qrcqml "qrcqml2"
+qt_add_resource(tst_qrcqml "qrcqml2"
     PREFIX
         "/search/data"
     FILES
@@ -78,7 +78,7 @@ set(qrcqml3_resource_files
     "data/imports/QrcImport/qmldir"
 )
 
-add_qt_resource(tst_qrcqml "qrcqml3"
+qt_add_resource(tst_qrcqml "qrcqml3"
     PREFIX
         "/imports"
     FILES
diff --git a/tests/auto/qml/qtqmlmodules/CMakeLists.txt b/tests/auto/qml/qtqmlmodules/CMakeLists.txt
index 7fd1021715..190a8d3034 100644
--- a/tests/auto/qml/qtqmlmodules/CMakeLists.txt
+++ b/tests/auto/qml/qtqmlmodules/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qtqmlmodules
+qt_add_test(tst_qtqmlmodules
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qtqmlmodules.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qtqmlmodules
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtqmlmodules CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qtqmlmodules CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qv4assembler/CMakeLists.txt b/tests/auto/qml/qv4assembler/CMakeLists.txt
index dd1d0d542a..b16aaf9f3f 100644
--- a/tests/auto/qml/qv4assembler/CMakeLists.txt
+++ b/tests/auto/qml/qv4assembler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qv4assembler
+qt_add_test(tst_qv4assembler
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qv4assembler.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qv4assembler
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qv4assembler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qv4assembler CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qv4identifiertable/CMakeLists.txt b/tests/auto/qml/qv4identifiertable/CMakeLists.txt
index b249d36a25..dd31cde5ad 100644
--- a/tests/auto/qml/qv4identifiertable/CMakeLists.txt
+++ b/tests/auto/qml/qv4identifiertable/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qv4identifiertable Test:
 #####################################################################
 
-add_qt_test(tst_qv4identifiertable
+qt_add_test(tst_qv4identifiertable
     SOURCES
         tst_qv4identifiertable.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qv4mm/CMakeLists.txt b/tests/auto/qml/qv4mm/CMakeLists.txt
index db84a6a36b..bd7c328acf 100644
--- a/tests/auto/qml/qv4mm/CMakeLists.txt
+++ b/tests/auto/qml/qv4mm/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qv4mm
+qt_add_test(tst_qv4mm
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
         tst_qv4mm.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qv4mm
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qv4mm CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qv4mm CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qv4regexp/CMakeLists.txt b/tests/auto/qml/qv4regexp/CMakeLists.txt
index 2044b6758e..5eb99906b1 100644
--- a/tests/auto/qml/qv4regexp/CMakeLists.txt
+++ b/tests/auto/qml/qv4regexp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qv4regexp Test:
 #####################################################################
 
-add_qt_test(tst_qv4regexp
+qt_add_test(tst_qv4regexp
     SOURCES
         tst_qv4regexp.cpp
     LIBRARIES
diff --git a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
index b297800281..fb6f9c9d6b 100644
--- a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
+++ b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwidgetsinqml Test:
 #####################################################################
 
-add_qt_test(tst_qwidgetsinqml
+qt_add_test(tst_qwidgetsinqml
     SOURCES
         tst_qwidgetsinqml.cpp
     DEFINES
diff --git a/tests/auto/qml/v4misc/CMakeLists.txt b/tests/auto/qml/v4misc/CMakeLists.txt
index ff9849da1e..75e7dcc88b 100644
--- a/tests/auto/qml/v4misc/CMakeLists.txt
+++ b/tests/auto/qml/v4misc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_v4misc Test:
 #####################################################################
 
-add_qt_test(tst_v4misc
+qt_add_test(tst_v4misc
     SOURCES
         tst_v4misc.cpp
     LIBRARIES
author	Alexandru Croitor <alexandru.croitor@qt.io>	2019-11-14 13:31:06 +0100
committer	Alexandru Croitor <alexandru.croitor@qt.io>	2019-11-15 12:24:51 +0000
commit	ba494aaa24defe1401f621b791891e696b308756 (patch)
tree	3617f29e9625fafbf94609ac79b2decd4033107c /tests/auto/qml
parent	91e32f86b53bb930405a58e19c84746ee85cdf89 (diff)