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>

28 files changed, 35 insertions, 35 deletions

diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
index caea7b1e64..32af66f30c 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmyserver Binary:
 #####################################################################
 
-add_qt_executable(qmyserver
+qt_add_executable(qmyserver
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../myobject.h
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
index 839b952591..d2bdb4434d 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmyserver Binary:
 #####################################################################
 
-add_qt_executable(qmyserver
+qt_add_executable(qmyserver
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     NO_INSTALL # special case
     SOURCES
diff --git a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
index facac1a7fc..55592832c1 100644
--- a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 add_subdirectory(qpinger)
 
-add_qt_test(tst_qdbusabstractinterface
+qt_add_test(tst_qdbusabstractinterface
     SOURCES
         interface.cpp
         tst_qdbusabstractinterface.cpp
@@ -11,7 +11,7 @@ add_qt_test(tst_qdbusabstractinterface
         Qt::DBus
 )
 
-extend_target(tst_qdbusabstractinterface
+qt_extend_target(tst_qdbusabstractinterface
     DBUS_INTERFACE_SOURCES
         org.qtproject.QtDBus.Pinger.xml
     DBUS_INTERFACE_BASENAME
diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
index ee5a7c4003..6db0362e59 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusabstractinterface Test:
 #####################################################################
 
-add_qt_test(tst_qdbusabstractinterface
+qt_add_test(tst_qdbusabstractinterface
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../interface.cpp ../interface.h
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
index 4e2b5fe567..7f65f85afb 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpinger Binary:
 #####################################################################
 
-add_qt_executable(qpinger
+qt_add_executable(qpinger
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../interface.cpp ../interface.h
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
index 47e3cfbb69..5ebb914c01 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpinger Binary:
 #####################################################################
 
-add_qt_executable(qpinger
+qt_add_executable(qpinger
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     NO_INSTALL # special case
     SOURCES
diff --git a/tests/auto/dbus/qdbusconnection/CMakeLists.txt b/tests/auto/dbus/qdbusconnection/CMakeLists.txt
index b1927e5d10..e40f18387e 100644
--- a/tests/auto/dbus/qdbusconnection/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection Test:
 #####################################################################
 
-add_qt_test(tst_qdbusconnection
+qt_add_test(tst_qdbusconnection
     SOURCES
         tst_qdbusconnection.cpp tst_qdbusconnection.h
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
index 0602c67fbb..793c7907e5 100644
--- a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_delayed Test:
 #####################################################################
 
-add_qt_test(tst_qdbusconnection_delayed
+qt_add_test(tst_qdbusconnection_delayed
     SOURCES
         tst_qdbusconnection_delayed.cpp
     DEFINES
diff --git a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
index 061c59579d..aad766362c 100644
--- a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_no_app Test:
 #####################################################################
 
-add_qt_test(tst_qdbusconnection_no_app
+qt_add_test(tst_qdbusconnection_no_app
     SOURCES
         ../qdbusconnection/tst_qdbusconnection.h
         tst_qdbusconnection_no_app.cpp
diff --git a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
index b05ac03b2d..111f8907c8 100644
--- a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_no_bus Test:
 #####################################################################
 
-add_qt_test(tst_qdbusconnection_no_bus
+qt_add_test(tst_qdbusconnection_no_bus
     SOURCES
         tst_qdbusconnection_no_bus.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
index c372f16d12..2a7e1dc80d 100644
--- a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_no_libdbus Test:
 #####################################################################
 
-add_qt_test(tst_qdbusconnection_no_libdbus
+qt_add_test(tst_qdbusconnection_no_libdbus
     SOURCES
         ../qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp
     DEFINES
diff --git a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
index 0005c36c36..a3b1d8d10c 100644
--- a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_spyhook Test:
 #####################################################################
 
-add_qt_test(tst_qdbusconnection_spyhook
+qt_add_test(tst_qdbusconnection_spyhook
     SOURCES
         ../qdbusconnection/tst_qdbusconnection.h
         tst_qdbusconnection_spyhook.cpp
diff --git a/tests/auto/dbus/qdbuscontext/CMakeLists.txt b/tests/auto/dbus/qdbuscontext/CMakeLists.txt
index d8adf50bd2..ee84e633af 100644
--- a/tests/auto/dbus/qdbuscontext/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuscontext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuscontext Test:
 #####################################################################
 
-add_qt_test(tst_qdbuscontext
+qt_add_test(tst_qdbuscontext
     SOURCES
         tst_qdbuscontext.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
index 671403999b..9c898fecf6 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmyserver_qdbusinterface Binary:
 #####################################################################
 
-add_qt_executable(qmyserver_qdbusinterface
+qt_add_executable(qmyserver_qdbusinterface
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../myobject.h
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
index de633f2aa9..916735bf59 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmyserver_qdbusinterface Binary:
 #####################################################################
 
-add_qt_executable(qmyserver_qdbusinterface
+qt_add_executable(qmyserver_qdbusinterface
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     NO_INSTALL # special case
     SOURCES
diff --git a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
index c65b48f948..378475dc46 100644
--- a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuslocalcalls Test:
 #####################################################################
 
-add_qt_test(tst_qdbuslocalcalls
+qt_add_test(tst_qdbuslocalcalls
     SOURCES
         tst_qdbuslocalcalls.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
index fc5f59990f..9130f434b5 100644
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusmarshall Test:
 #####################################################################
 
-add_qt_test(tst_qdbusmarshall
+qt_add_test(tst_qdbusmarshall
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qdbusmarshall.cpp
@@ -16,14 +16,14 @@ add_qt_test(tst_qdbusmarshall
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     PUBLIC_LIBRARIES
         dbus-1
 )
 
-extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
     SOURCES
         ../../../../../src/dbus/qdbus_symbols.cpp
 )
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
index bd615ab900..86ef627276 100644
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusmarshall Test:
 #####################################################################
 
-add_qt_test(tst_qdbusmarshall
+qt_add_test(tst_qdbusmarshall
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qdbusmarshall.cpp
@@ -20,14 +20,14 @@ add_qt_test(tst_qdbusmarshall
 # This test case interacts with dbus code directly via the private
 # headers. The include path is also not exposed via Qt:DBus.
 # special case end
-extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     PUBLIC_LIBRARIES
         dbus-1
 )
 
-extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
     SOURCES
         ../../../../../src/dbus/qdbus_symbols.cpp
 )
diff --git a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
index e53c11aabe..28e96caf15 100644
--- a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpong Binary:
 #####################################################################
 
-add_qt_executable(qpong
+qt_add_executable(qpong
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         qpong.cpp
diff --git a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
index 31cf3aff44..9fe730c533 100644
--- a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusmetaobject Test:
 #####################################################################
 
-add_qt_test(tst_qdbusmetaobject
+qt_add_test(tst_qdbusmetaobject
     SOURCES
         tst_qdbusmetaobject.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
index 1bc7871f8c..d4878f681c 100644
--- a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusmetatype Test:
 #####################################################################
 
-add_qt_test(tst_qdbusmetatype
+qt_add_test(tst_qdbusmetatype
     SOURCES
         tst_qdbusmetatype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
index d432fd3f6c..47c4261313 100644
--- a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuspendingcall Test:
 #####################################################################
 
-add_qt_test(tst_qdbuspendingcall
+qt_add_test(tst_qdbuspendingcall
     SOURCES
         tst_qdbuspendingcall.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
index f6ff6afe8c..2ece3ac4bf 100644
--- a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuspendingreply Test:
 #####################################################################
 
-add_qt_test(tst_qdbuspendingreply
+qt_add_test(tst_qdbuspendingreply
     SOURCES
         tst_qdbuspendingreply.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusreply/CMakeLists.txt b/tests/auto/dbus/qdbusreply/CMakeLists.txt
index 11770e16d5..5f75e52d4f 100644
--- a/tests/auto/dbus/qdbusreply/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusreply/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusreply Test:
 #####################################################################
 
-add_qt_test(tst_qdbusreply
+qt_add_test(tst_qdbusreply
     SOURCES
         tst_qdbusreply.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
index 436629ab80..d4b16feebd 100644
--- a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusservicewatcher Test:
 #####################################################################
 
-add_qt_test(tst_qdbusservicewatcher
+qt_add_test(tst_qdbusservicewatcher
     SOURCES
         tst_qdbusservicewatcher.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusthreading/CMakeLists.txt b/tests/auto/dbus/qdbusthreading/CMakeLists.txt
index 1c8f8a6053..f0a0bebb20 100644
--- a/tests/auto/dbus/qdbusthreading/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusthreading/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusthreading Test:
 #####################################################################
 
-add_qt_test(tst_qdbusthreading
+qt_add_test(tst_qdbusthreading
     SOURCES
         tst_qdbusthreading.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt
index 34456d6331..a7d8104ec7 100644
--- a/tests/auto/dbus/qdbustype/CMakeLists.txt
+++ b/tests/auto/dbus/qdbustype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbustype Test:
 #####################################################################
 
-add_qt_test(tst_qdbustype
+qt_add_test(tst_qdbustype
     SOURCES
         tst_qdbustype.cpp
     PUBLIC_LIBRARIES
@@ -15,14 +15,14 @@ add_qt_test(tst_qdbustype
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     PUBLIC_LIBRARIES
         dbus-1
 )
 
-extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
+qt_extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
     SOURCES
         ../../../../src/dbus/qdbus_symbols.cpp
 )
diff --git a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
index 879f8d28e4..7390c25cb4 100644
--- a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusxmlparser Test:
 #####################################################################
 
-add_qt_test(tst_qdbusxmlparser
+qt_add_test(tst_qdbusxmlparser
     SOURCES
         tst_qdbusxmlparser.cpp
     PUBLIC_LIBRARIES