Regenerate projects to be in sync

Change-Id: I3a57449c9025e22414b8337fcffdeb0f4d769af2
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

36 files changed, 91 insertions, 91 deletions

diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt
index 3712803a..5d239ddc 100644
--- a/tests/auto/accessibility/CMakeLists.txt
+++ b/tests/auto/accessibility/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_accessibility
+qt_add_test(tst_accessibility
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,12 +40,12 @@ add_qt_test(tst_accessibility
 ## Scopes:
 #####################################################################
 
-extend_target(tst_accessibility CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_accessibility CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/calendar/CMakeLists.txt b/tests/auto/calendar/CMakeLists.txt
index f729018f..34937d14 100644
--- a/tests/auto/calendar/CMakeLists.txt
+++ b/tests/auto/calendar/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_calendar
+qt_add_test(tst_calendar
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/controls/default/CMakeLists.txt b/tests/auto/controls/default/CMakeLists.txt
index 147a02be..9a4f6cbd 100644
--- a/tests/auto/controls/default/CMakeLists.txt
+++ b/tests/auto/controls/default/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_default
+qt_add_test(tst_default
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/controls/fusion/CMakeLists.txt b/tests/auto/controls/fusion/CMakeLists.txt
index 4426c320..fd348526 100644
--- a/tests/auto/controls/fusion/CMakeLists.txt
+++ b/tests/auto/controls/fusion/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_fusion
+qt_add_test(tst_fusion
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/controls/imagine/CMakeLists.txt b/tests/auto/controls/imagine/CMakeLists.txt
index c41f75a2..9d7f2e3a 100644
--- a/tests/auto/controls/imagine/CMakeLists.txt
+++ b/tests/auto/controls/imagine/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_imagine
+qt_add_test(tst_imagine
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/controls/material/CMakeLists.txt b/tests/auto/controls/material/CMakeLists.txt
index f4ae1e62..04c2655a 100644
--- a/tests/auto/controls/material/CMakeLists.txt
+++ b/tests/auto/controls/material/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_material
+qt_add_test(tst_material
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/controls/universal/CMakeLists.txt b/tests/auto/controls/universal/CMakeLists.txt
index f12a05af..e5576020 100644
--- a/tests/auto/controls/universal/CMakeLists.txt
+++ b/tests/auto/controls/universal/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_universal
+qt_add_test(tst_universal
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt
index d1db2aa6..9d58b48e 100644
--- a/tests/auto/cursor/CMakeLists.txt
+++ b/tests/auto/cursor/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_cursor
+qt_add_test(tst_cursor
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,12 +40,12 @@ add_qt_test(tst_cursor
 ## Scopes:
 #####################################################################
 
-extend_target(tst_cursor CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_cursor CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_cursor CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt
index d012b7c1..2e25d8a4 100644
--- a/tests/auto/customization/CMakeLists.txt
+++ b/tests/auto/customization/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_customization
+qt_add_test(tst_customization
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -37,12 +37,12 @@ add_qt_test(tst_customization
 ## Scopes:
 #####################################################################
 
-extend_target(tst_customization CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_customization CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_customization CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_customization CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/designer/CMakeLists.txt b/tests/auto/designer/CMakeLists.txt
index b70c80d1..5731e570 100644
--- a/tests/auto/designer/CMakeLists.txt
+++ b/tests/auto/designer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_designer Test:
 #####################################################################
 
-add_qt_test(tst_designer
+qt_add_test(tst_designer
     SOURCES
         tst_designer.cpp
     LIBRARIES
diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt
index cb182044..be2a3016 100644
--- a/tests/auto/focus/CMakeLists.txt
+++ b/tests/auto/focus/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_focus
+qt_add_test(tst_focus
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -37,12 +37,12 @@ add_qt_test(tst_focus
 ## Scopes:
 #####################################################################
 
-extend_target(tst_focus CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_focus CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_focus CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_focus CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/font/CMakeLists.txt b/tests/auto/font/CMakeLists.txt
index 75a30fe1..daeb391f 100644
--- a/tests/auto/font/CMakeLists.txt
+++ b/tests/auto/font/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_font
+qt_add_test(tst_font
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -41,12 +41,12 @@ add_qt_test(tst_font
 ## Scopes:
 #####################################################################
 
-extend_target(tst_font CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_font CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_font CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_font CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/palette/CMakeLists.txt
index e0ca9bb8..6675af36 100644
--- a/tests/auto/palette/CMakeLists.txt
+++ b/tests/auto/palette/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_palette
+qt_add_test(tst_palette
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,7 +40,7 @@ set(qmake_immediate_resource_files
     "qtquickcontrols2.conf"
 )
 
-add_qt_resource(tst_palette "qmake_immediate"
+qt_add_resource(tst_palette "qmake_immediate"
     PREFIX
         "/"
     FILES
@@ -54,12 +54,12 @@ add_qt_resource(tst_palette "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_palette CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_palette CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_palette CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/platform/CMakeLists.txt b/tests/auto/platform/CMakeLists.txt
index 5fba6eb1..ec4e54ee 100644
--- a/tests/auto/platform/CMakeLists.txt
+++ b/tests/auto/platform/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_platform
+qt_add_test(tst_platform
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/pressandhold/CMakeLists.txt b/tests/auto/pressandhold/CMakeLists.txt
index 2564081d..a5c1b845 100644
--- a/tests/auto/pressandhold/CMakeLists.txt
+++ b/tests/auto/pressandhold/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_pressandhold Test:
 #####################################################################
 
-add_qt_test(tst_pressandhold
+qt_add_test(tst_pressandhold
     SOURCES
         tst_pressandhold.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qquickapplicationwindow/CMakeLists.txt b/tests/auto/qquickapplicationwindow/CMakeLists.txt
index 78cfc9dc..26aa0331 100644
--- a/tests/auto/qquickapplicationwindow/CMakeLists.txt
+++ b/tests/auto/qquickapplicationwindow/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickapplicationwindow
+qt_add_test(tst_qquickapplicationwindow
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -41,12 +41,12 @@ add_qt_test(tst_qquickapplicationwindow
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickcolor/CMakeLists.txt b/tests/auto/qquickcolor/CMakeLists.txt
index 7e74b935..bf660d10 100644
--- a/tests/auto/qquickcolor/CMakeLists.txt
+++ b/tests/auto/qquickcolor/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickcolor
+qt_add_test(tst_qquickcolor
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt
index 292d401a..db35045a 100644
--- a/tests/auto/qquickdrawer/CMakeLists.txt
+++ b/tests/auto/qquickdrawer/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickdrawer
+qt_add_test(tst_qquickdrawer
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,12 +40,12 @@ add_qt_test(tst_qquickdrawer
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickdrawer CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdrawer CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt
index bd78aab0..c2628782 100644
--- a/tests/auto/qquickiconimage/CMakeLists.txt
+++ b/tests/auto/qquickiconimage/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickiconimage
+qt_add_test(tst_qquickiconimage
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -56,7 +56,7 @@ set(resources_resource_files
     "icons/testtheme/index.theme"
 )
 
-add_qt_resource(tst_qquickiconimage "resources"
+qt_add_resource(tst_qquickiconimage "resources"
     PREFIX
         "/"
     FILES
@@ -67,17 +67,17 @@ add_qt_resource(tst_qquickiconimage "resources"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg
+qt_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg
     PUBLIC_LIBRARIES
         Qt::Svg
 )
 
-extend_target(tst_qquickiconimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickiconimage CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt
index d1855bda..fc3de622 100644
--- a/tests/auto/qquickiconlabel/CMakeLists.txt
+++ b/tests/auto/qquickiconlabel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickiconlabel
+qt_add_test(tst_qquickiconlabel
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -38,12 +38,12 @@ add_qt_test(tst_qquickiconlabel
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickiconlabel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickiconlabel CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickimaginestyle/CMakeLists.txt b/tests/auto/qquickimaginestyle/CMakeLists.txt
index 57e00c9a..5ab0176c 100644
--- a/tests/auto/qquickimaginestyle/CMakeLists.txt
+++ b/tests/auto/qquickimaginestyle/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickimaginestyle
+qt_add_test(tst_qquickimaginestyle
     GUI
     QMLTEST
     SOURCES
@@ -26,7 +26,7 @@ set(qmake_immediate_resource_files
     "qtquickcontrols2.conf"
 )
 
-add_qt_resource(tst_qquickimaginestyle "qmake_immediate"
+qt_add_resource(tst_qquickimaginestyle "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qquickmaterialstyle/CMakeLists.txt b/tests/auto/qquickmaterialstyle/CMakeLists.txt
index 1f43a0c1..cf43db51 100644
--- a/tests/auto/qquickmaterialstyle/CMakeLists.txt
+++ b/tests/auto/qquickmaterialstyle/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickmaterialstyle
+qt_add_test(tst_qquickmaterialstyle
     GUI
     QMLTEST
     SOURCES
@@ -25,7 +25,7 @@ set(qmake_immediate_resource_files
     "qtquickcontrols2.conf"
 )
 
-add_qt_resource(tst_qquickmaterialstyle "qmake_immediate"
+qt_add_resource(tst_qquickmaterialstyle "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
index 6c4b296a..054b0cc3 100644
--- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
+++ b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickmaterialstyleconf
+qt_add_test(tst_qquickmaterialstyleconf
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -42,7 +42,7 @@ set(qquickmaterialstyleconf_resource_files
     "variant-normal.conf"
 )
 
-add_qt_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf"
+qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf"
     PREFIX
         "/"
     FILES
@@ -56,12 +56,12 @@ add_qt_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt
index 13d0fec0..4152869c 100644
--- a/tests/auto/qquickmenu/CMakeLists.txt
+++ b/tests/auto/qquickmenu/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickmenu
+qt_add_test(tst_qquickmenu
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,12 +40,12 @@ add_qt_test(tst_qquickmenu
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickmenu CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmenu CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt
index 567cd711..c066ef01 100644
--- a/tests/auto/qquickmenubar/CMakeLists.txt
+++ b/tests/auto/qquickmenubar/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickmenubar
+qt_add_test(tst_qquickmenubar
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,12 +40,12 @@ add_qt_test(tst_qquickmenubar
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickmenubar CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmenubar CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt
index b2da6d88..dc8e0a5b 100644
--- a/tests/auto/qquickninepatchimage/CMakeLists.txt
+++ b/tests/auto/qquickninepatchimage/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/*.png)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickninepatchimage
+qt_add_test(tst_qquickninepatchimage
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -42,12 +42,12 @@ add_qt_test(tst_qquickninepatchimage
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickninepatchimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt
index 7f2c38e9..7df9ac8a 100644
--- a/tests/auto/qquickpopup/CMakeLists.txt
+++ b/tests/auto/qquickpopup/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickpopup
+qt_add_test(tst_qquickpopup
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,12 +40,12 @@ add_qt_test(tst_qquickpopup
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickpopup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpopup CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/qquickstyle/CMakeLists.txt
index e01d8a9d..ea824969 100644
--- a/tests/auto/qquickstyle/CMakeLists.txt
+++ b/tests/auto/qquickstyle/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickstyle
+qt_add_test(tst_qquickstyle
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -60,7 +60,7 @@ set(qmake_qrcStyles1_resource_files
     ${resource_glob_0}
 )
 
-add_qt_resource(tst_qquickstyle "qmake_qrcStyles1"
+qt_add_resource(tst_qquickstyle "qmake_qrcStyles1"
     PREFIX
         "/"
     FILES
@@ -70,7 +70,7 @@ set(qmake_qrcStyles2_resource_files
     ${resource_glob_1}
 )
 
-add_qt_resource(tst_qquickstyle "qmake_qrcStyles2"
+qt_add_resource(tst_qquickstyle "qmake_qrcStyles2"
     PREFIX
         "/"
     FILES
@@ -80,7 +80,7 @@ set(qmake_qrcStyles3_resource_files
     ${resource_glob_2}
 )
 
-add_qt_resource(tst_qquickstyle "qmake_qrcStyles3"
+qt_add_resource(tst_qquickstyle "qmake_qrcStyles3"
     PREFIX
         "/"
     FILES
@@ -90,7 +90,7 @@ set(qmake_qrcStyles4_resource_files
     ${resource_glob_3}
 )
 
-add_qt_resource(tst_qquickstyle "qmake_qrcStyles4"
+qt_add_resource(tst_qquickstyle "qmake_qrcStyles4"
     PREFIX
         "/"
     FILES
@@ -101,12 +101,12 @@ add_qt_resource(tst_qquickstyle "qmake_qrcStyles4"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickstyle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickstyle CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickstyleselector/CMakeLists.txt b/tests/auto/qquickstyleselector/CMakeLists.txt
index d01a7833..b9d8d671 100644
--- a/tests/auto/qquickstyleselector/CMakeLists.txt
+++ b/tests/auto/qquickstyleselector/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickstyleselector
+qt_add_test(tst_qquickstyleselector
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,7 +40,7 @@ set(qmake_resourcestyle_resource_files
     "ResourceStyle/Button.qml"
 )
 
-add_qt_resource(tst_qquickstyleselector "qmake_resourcestyle"
+qt_add_resource(tst_qquickstyleselector "qmake_resourcestyle"
     PREFIX
         "/"
     FILES
@@ -54,12 +54,12 @@ add_qt_resource(tst_qquickstyleselector "qmake_resourcestyle"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickstyleselector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickstyleselector CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickuniversalstyle/CMakeLists.txt b/tests/auto/qquickuniversalstyle/CMakeLists.txt
index 7775afa0..99816bef 100644
--- a/tests/auto/qquickuniversalstyle/CMakeLists.txt
+++ b/tests/auto/qquickuniversalstyle/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickuniversalstyle
+qt_add_test(tst_qquickuniversalstyle
     GUI
     QMLTEST
     SOURCES
@@ -25,7 +25,7 @@ set(qmake_immediate_resource_files
     "qtquickcontrols2.conf"
 )
 
-add_qt_resource(tst_qquickuniversalstyle "qmake_immediate"
+qt_add_resource(tst_qquickuniversalstyle "qmake_immediate"
     PREFIX
         "/"
     FILES
diff --git a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
index 8de13b0f..361e690f 100644
--- a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
+++ b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qquickuniversalstyleconf
+qt_add_test(tst_qquickuniversalstyleconf
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -40,7 +40,7 @@ set(qquickuniversalstyleconf_resource_files
     "qtquickcontrols2.conf"
 )
 
-add_qt_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf"
+qt_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf"
     PREFIX
         "/"
     FILES
@@ -54,12 +54,12 @@ add_qt_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/revisions/CMakeLists.txt b/tests/auto/revisions/CMakeLists.txt
index 46c1d4c9..be0754fc 100644
--- a/tests/auto/revisions/CMakeLists.txt
+++ b/tests/auto/revisions/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_revisions Test:
 #####################################################################
 
-add_qt_test(tst_revisions
+qt_add_test(tst_revisions
     SOURCES
         tst_revisions.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/sanity/CMakeLists.txt
index 0e566d95..f4f6fcdc 100644
--- a/tests/auto/sanity/CMakeLists.txt
+++ b/tests/auto/sanity/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_sanity Test:
 #####################################################################
 
-add_qt_test(tst_sanity
+qt_add_test(tst_sanity
     SOURCES
         ../shared/qtest_quickcontrols.h
         ../shared/util.cpp ../shared/util.h
@@ -34,12 +34,12 @@ add_qt_test(tst_sanity
 ## Scopes:
 #####################################################################
 
-extend_target(tst_sanity CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_sanity CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_sanity CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/snippets/CMakeLists.txt b/tests/auto/snippets/CMakeLists.txt
index 2ec9620e..f5d60a40 100644
--- a/tests/auto/snippets/CMakeLists.txt
+++ b/tests/auto/snippets/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_snippets
+qt_add_test(tst_snippets
     SOURCES
         tst_snippets.cpp
     DEFINES
diff --git a/tests/benchmarks/creationtime/CMakeLists.txt b/tests/benchmarks/creationtime/CMakeLists.txt
index d1365266..312c3970 100644
--- a/tests/benchmarks/creationtime/CMakeLists.txt
+++ b/tests/benchmarks/creationtime/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_creationtime Test:
 #####################################################################
 
-add_qt_test(tst_creationtime
+qt_add_test(tst_creationtime
     SOURCES
         ../../auto/shared/qtest_quickcontrols.h
         ../../auto/shared/util.cpp ../../auto/shared/util.h
@@ -33,12 +33,12 @@ add_qt_test(tst_creationtime
 ## Scopes:
 #####################################################################
 
-extend_target(tst_creationtime CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_creationtime CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/benchmarks/objectcount/CMakeLists.txt b/tests/benchmarks/objectcount/CMakeLists.txt
index 3ba8cafe..1f284128 100644
--- a/tests/benchmarks/objectcount/CMakeLists.txt
+++ b/tests/benchmarks/objectcount/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_objectcount Test:
 #####################################################################
 
-add_qt_test(tst_objectcount
+qt_add_test(tst_objectcount
     SOURCES
         ../../auto/shared/qtest_quickcontrols.h
         ../../auto/shared/util.cpp ../../auto/shared/util.h
@@ -33,12 +33,12 @@ add_qt_test(tst_objectcount
 ## Scopes:
 #####################################################################
 
-extend_target(tst_objectcount CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_objectcount CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )