CMake: Regenerate tests with new qt_ prefixed APIs

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

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

26 files changed, 37 insertions, 37 deletions

diff --git a/tests/auto/other/android/CMakeLists.txt b/tests/auto/other/android/CMakeLists.txt
index e59111bb40..437a4ee9d2 100644
--- a/tests/auto/other/android/CMakeLists.txt
+++ b/tests/auto/other/android/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_android Test:
 #####################################################################
 
-add_qt_test(tst_android
+qt_add_test(tst_android
     SOURCES
         tst_android.cpp
 )
diff --git a/tests/auto/other/compiler/.prev_CMakeLists.txt b/tests/auto/other/compiler/.prev_CMakeLists.txt
index 6824640d93..4a9cdcef14 100644
--- a/tests/auto/other/compiler/.prev_CMakeLists.txt
+++ b/tests/auto/other/compiler/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_compiler Test:
 #####################################################################
 
-add_qt_test(tst_compiler
+qt_add_test(tst_compiler
     SOURCES
         baseclass.cpp baseclass.h
         derivedclass.cpp derivedclass.h
diff --git a/tests/auto/other/compiler/CMakeLists.txt b/tests/auto/other/compiler/CMakeLists.txt
index 1849b7ec2c..6aa7c43966 100644
--- a/tests/auto/other/compiler/CMakeLists.txt
+++ b/tests/auto/other/compiler/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_compiler Test:
 #####################################################################
 
-add_qt_test(tst_compiler
+qt_add_test(tst_compiler
     EXCEPTIONS # special case
     SOURCES
         baseclass.cpp baseclass.h
diff --git a/tests/auto/other/gestures/CMakeLists.txt b/tests/auto/other/gestures/CMakeLists.txt
index b1a07e6cb3..71bcc22f01 100644
--- a/tests/auto/other/gestures/CMakeLists.txt
+++ b/tests/auto/other/gestures/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_gestures Test:
 #####################################################################
 
-add_qt_test(tst_gestures
+qt_add_test(tst_gestures
     SOURCES
         tst_gestures.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt
index 6f15ff7990..f485a48ebe 100644
--- a/tests/auto/other/lancelot/CMakeLists.txt
+++ b/tests/auto/other/lancelot/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     scripts/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_lancelot
+qt_add_test(tst_lancelot
     SOURCES
         ../../../baselineserver/shared/baselineprotocol.cpp ../../../baselineserver/shared/baselineprotocol.h
         ../../../baselineserver/shared/lookup3.cpp
@@ -61,7 +61,7 @@ set(images_resource_files
     "images/zebra.png"
 )
 
-add_qt_resource(tst_lancelot "images"
+qt_add_resource(tst_lancelot "images"
     PREFIX
         "/"
     FILES
@@ -72,7 +72,7 @@ add_qt_resource(tst_lancelot "images"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_lancelot CONDITION QT_FEATURE_opengl
+qt_extend_target(tst_lancelot CONDITION QT_FEATURE_opengl
     PUBLIC_LIBRARIES
         Qt::OpenGL
 )
diff --git a/tests/auto/other/languagechange/CMakeLists.txt b/tests/auto/other/languagechange/CMakeLists.txt
index f5c43b0ed1..0ace85d654 100644
--- a/tests/auto/other/languagechange/CMakeLists.txt
+++ b/tests/auto/other/languagechange/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_languagechange Test:
 #####################################################################
 
-add_qt_test(tst_languagechange
+qt_add_test(tst_languagechange
     SOURCES
         tst_languagechange.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt
index 1ae468c40e..e9b794dcdc 100644
--- a/tests/auto/other/macgui/.prev_CMakeLists.txt
+++ b/tests/auto/other/macgui/.prev_CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 ## tst_macgui Test:
 #####################################################################
 
-add_qt_test(tst_macgui
+qt_add_test(tst_macgui
     SOURCES
         guitest.cpp guitest.h
         tst_macgui.cpp
@@ -26,7 +26,7 @@ add_qt_test(tst_macgui
 ## Scopes:
 #####################################################################
 
-extend_target(tst_macgui CONDITION MACOS
+qt_extend_target(tst_macgui CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWApplicationServices}
 )
diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt
index 4a5aa0aaef..116049bd85 100644
--- a/tests/auto/other/macgui/CMakeLists.txt
+++ b/tests/auto/other/macgui/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 ## tst_macgui Test:
 #####################################################################
 
-add_qt_test(tst_macgui
+qt_add_test(tst_macgui
     SOURCES
         guitest.cpp guitest.h
         tst_macgui.cpp
@@ -26,7 +26,7 @@ add_qt_test(tst_macgui
 ## Scopes:
 #####################################################################
 
-extend_target(tst_macgui CONDITION MACOS
+qt_extend_target(tst_macgui CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWApplicationServices}
 )
diff --git a/tests/auto/other/macnativeevents/CMakeLists.txt b/tests/auto/other/macnativeevents/CMakeLists.txt
index 167e46055a..f22996a66e 100644
--- a/tests/auto/other/macnativeevents/CMakeLists.txt
+++ b/tests/auto/other/macnativeevents/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_macnativeevents Test:
 #####################################################################
 
-add_qt_test(tst_macnativeevents
+qt_add_test(tst_macnativeevents
     SOURCES
         expectedeventlist.cpp expectedeventlist.h
         nativeeventlist.cpp nativeeventlist.h
diff --git a/tests/auto/other/macplist/app/.prev_CMakeLists.txt b/tests/auto/other/macplist/app/.prev_CMakeLists.txt
index f04afb4311..0cf205bf55 100644
--- a/tests/auto/other/macplist/app/.prev_CMakeLists.txt
+++ b/tests/auto/other/macplist/app/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## app Binary:
 #####################################################################
 
-add_qt_executable(app
+qt_add_executable(app
     GUI
     SOURCES
         main.cpp
diff --git a/tests/auto/other/macplist/app/CMakeLists.txt b/tests/auto/other/macplist/app/CMakeLists.txt
index 2effb2aa34..65ccfee32b 100644
--- a/tests/auto/other/macplist/app/CMakeLists.txt
+++ b/tests/auto/other/macplist/app/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## app Binary:
 #####################################################################
 
-add_qt_executable(app
+qt_add_executable(app
     GUI
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
diff --git a/tests/auto/other/macplist/test/CMakeLists.txt b/tests/auto/other/macplist/test/CMakeLists.txt
index 3cb8066adf..23faffbdcf 100644
--- a/tests/auto/other/macplist/test/CMakeLists.txt
+++ b/tests/auto/other/macplist/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_macplist Test:
 #####################################################################
 
-add_qt_test(tst_macplist
+qt_add_test(tst_macplist
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_macplist.cpp
diff --git a/tests/auto/other/networkselftest/CMakeLists.txt b/tests/auto/other/networkselftest/CMakeLists.txt
index 7765557248..7093ed0160 100644
--- a/tests/auto/other/networkselftest/CMakeLists.txt
+++ b/tests/auto/other/networkselftest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_networkselftest Test:
 #####################################################################
 
-add_qt_test(tst_networkselftest
+qt_add_test(tst_networkselftest
     SOURCES
         tst_networkselftest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
index 340a2f14ec..edbea40cc2 100644
--- a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qaccessibility Test:
 #####################################################################
 
-add_qt_test(tst_qaccessibility
+qt_add_test(tst_qaccessibility
     SOURCES
         accessiblewidgets.h
         tst_qaccessibility.cpp
@@ -26,12 +26,12 @@ add_qt_test(tst_qaccessibility
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
+qt_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
     PUBLIC_LIBRARIES
         m
 )
 
-extend_target(tst_qaccessibility CONDITION WIN32
+qt_extend_target(tst_qaccessibility CONDITION WIN32
     PUBLIC_LIBRARIES
         ole32
         oleacc
diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt
index 18785e4e86..53960845ab 100644
--- a/tests/auto/other/qaccessibility/CMakeLists.txt
+++ b/tests/auto/other/qaccessibility/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 ## tst_qaccessibility Test:
 #####################################################################
 
-add_qt_test(tst_qaccessibility
+qt_add_test(tst_qaccessibility
     SOURCES
         accessiblewidgets.h
         tst_qaccessibility.cpp
@@ -32,12 +32,12 @@ add_qt_test(tst_qaccessibility
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
+qt_extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
     PUBLIC_LIBRARIES
         m
 )
 
-extend_target(tst_qaccessibility CONDITION WIN32
+qt_extend_target(tst_qaccessibility CONDITION WIN32
     PUBLIC_LIBRARIES
         ole32
         oleacc
diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
index 343df83dc0..8d48b5a0fa 100644
--- a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qaccessibilitylinux Test:
 #####################################################################
 
-add_qt_test(tst_qaccessibilitylinux
+qt_add_test(tst_qaccessibilitylinux
     SOURCES
         tst_qaccessibilitylinux.cpp
     DBUS_INTERFACE_SOURCES
diff --git a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
index 2785b93738..70f0c67f98 100644
--- a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 ## tst_qaccessibilitylinux Test:
 #####################################################################
 
-add_qt_test(tst_qaccessibilitylinux
+qt_add_test(tst_qaccessibilitylinux
     SOURCES
         tst_qaccessibilitylinux.cpp
     DBUS_INTERFACE_SOURCES
diff --git a/tests/auto/other/qaccessibilitymac/CMakeLists.txt b/tests/auto/other/qaccessibilitymac/CMakeLists.txt
index ab8b9fcb9b..40a4527011 100644
--- a/tests/auto/other/qaccessibilitymac/CMakeLists.txt
+++ b/tests/auto/other/qaccessibilitymac/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qaccessibilitymac Test:
 #####################################################################
 
-add_qt_test(tst_qaccessibilitymac
+qt_add_test(tst_qaccessibilitymac
     SOURCES
         tst_qaccessibilitymac.cpp
         tst_qaccessibilitymac_helpers.h
@@ -23,7 +23,7 @@ add_qt_test(tst_qaccessibilitymac
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qaccessibilitymac CONDITION APPLE
+qt_extend_target(tst_qaccessibilitymac CONDITION APPLE
     SOURCES
         tst_qaccessibilitymac_helpers.mm
     PUBLIC_LIBRARIES
diff --git a/tests/auto/other/qcomplextext/CMakeLists.txt b/tests/auto/other/qcomplextext/CMakeLists.txt
index ee504faaf7..2b5f951267 100644
--- a/tests/auto/other/qcomplextext/CMakeLists.txt
+++ b/tests/auto/other/qcomplextext/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "data")
 
-add_qt_test(tst_qcomplextext
+qt_add_test(tst_qcomplextext
     SOURCES
         tst_qcomplextext.cpp
     PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID)
         "data/BidiTest.txt"
     )
 
-    add_qt_resource(tst_qcomplextext "android_testdata"
+    qt_add_resource(tst_qcomplextext "android_testdata"
         PREFIX
             "/android_testdata"
         FILES
@@ -35,7 +35,7 @@ if(ANDROID)
     )
 endif()
 
-extend_target(tst_qcomplextext CONDITION builtin_testdata
+qt_extend_target(tst_qcomplextext CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/other/qfocusevent/CMakeLists.txt b/tests/auto/other/qfocusevent/CMakeLists.txt
index a2406c034a..01275d7665 100644
--- a/tests/auto/other/qfocusevent/CMakeLists.txt
+++ b/tests/auto/other/qfocusevent/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfocusevent Test:
 #####################################################################
 
-add_qt_test(tst_qfocusevent
+qt_add_test(tst_qfocusevent
     SOURCES
         tst_qfocusevent.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt
index c4b9b186a1..1e806d4589 100644
--- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkaccessmanager_and_qprogressdialog Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkaccessmanager_and_qprogressdialog
+qt_add_test(tst_qnetworkaccessmanager_and_qprogressdialog
     SOURCES
         tst_qnetworkaccessmanager_and_qprogressdialog.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/other/qobjectrace/CMakeLists.txt b/tests/auto/other/qobjectrace/CMakeLists.txt
index 972fdcfcac..c3189b1da6 100644
--- a/tests/auto/other/qobjectrace/CMakeLists.txt
+++ b/tests/auto/other/qobjectrace/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qobjectrace Test:
 #####################################################################
 
-add_qt_test(qobjectrace
+qt_add_test(qobjectrace
     SOURCES
         ../../../shared/emulationdetector.h
         tst_qobjectrace.cpp
diff --git a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
index dfea85f3e3..e5b746297f 100644
--- a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
+++ b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## write-read-write Binary:
 #####################################################################
 
-add_qt_executable(write-read-write
+qt_add_executable(write-read-write
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt
index 5175bb68fe..9abf6a010d 100644
--- a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt
+++ b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsharedpointer_and_qwidget Test:
 #####################################################################
 
-add_qt_test(tst_qsharedpointer_and_qwidget
+qt_add_test(tst_qsharedpointer_and_qwidget
     SOURCES
         tst_qsharedpointer_and_qwidget.cpp
     DEFINES
diff --git a/tests/auto/other/toolsupport/CMakeLists.txt b/tests/auto/other/toolsupport/CMakeLists.txt
index 51af17d866..d13580799c 100644
--- a/tests/auto/other/toolsupport/CMakeLists.txt
+++ b/tests/auto/other/toolsupport/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_toolsupport Test:
 #####################################################################
 
-add_qt_test(tst_toolsupport
+qt_add_test(tst_toolsupport
     SOURCES
         tst_toolsupport.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/other/xkbkeyboard/CMakeLists.txt b/tests/auto/other/xkbkeyboard/CMakeLists.txt
index 93a02eea12..9c92ff65ba 100644
--- a/tests/auto/other/xkbkeyboard/CMakeLists.txt
+++ b/tests/auto/other/xkbkeyboard/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_xkbkeyboard Test:
 #####################################################################
 
-add_qt_test(tst_xkbkeyboard
+qt_add_test(tst_xkbkeyboard
     SOURCES
         tst_xkbkeyboard.cpp
     PUBLIC_LIBRARIES