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>

22 files changed, 48 insertions, 48 deletions

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