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>

12 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt
index 6f477bb541..57cab16b3d 100644
--- a/tests/auto/corelib/serialization/json/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/json/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_json Test:
 #####################################################################
 
-add_qt_test(tst_json
+qt_add_test(tst_json
     SOURCES
         tst_qtjson.cpp
     PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID)
         "test3.json"
     )
 
-    add_qt_resource(tst_json "json"
+    qt_add_resource(tst_json "json"
         PREFIX
             "/"
         FILES
@@ -35,7 +35,7 @@ if(ANDROID)
     )
 endif()
 
-extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
+qt_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
     DEFINES
         QT_NO_DOUBLECONVERSION
 )
diff --git a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt
index d5f5aea5be..74d4e692df 100644
--- a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcborstreamreader Test:
 #####################################################################
 
-add_qt_test(tst_qcborstreamreader
+qt_add_test(tst_qcborstreamreader
     SOURCES
         tst_qcborstreamreader.cpp
     DEFINES
diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
index 9265df415e..33707ff24f 100644
--- a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcborstreamwriter Test:
 #####################################################################
 
-add_qt_test(tst_qcborstreamwriter
+qt_add_test(tst_qcborstreamwriter
     SOURCES
         tst_qcborstreamwriter.cpp
     DEFINES
diff --git a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
index 0835ac9c50..3877e565cd 100644
--- a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcborvalue Test:
 #####################################################################
 
-add_qt_test(tst_qcborvalue
+qt_add_test(tst_qcborvalue
     SOURCES
         tst_qcborvalue.cpp
     DEFINES
diff --git a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt
index 0346d2d0e0..8801d67783 100644
--- a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcborvalue_json Test:
 #####################################################################
 
-add_qt_test(tst_qcborvalue_json
+qt_add_test(tst_qcborvalue_json
     SOURCES
         tst_qcborvalue_json.cpp
     DEFINES
diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
index a293f87155..35a62fe00c 100644
--- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "datastream.q42")
 
-add_qt_test(tst_qdatastream
+qt_add_test(tst_qdatastream
     SOURCES
         tst_qdatastream.cpp
     PUBLIC_LIBRARIES
@@ -24,7 +24,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "datastream.q42"
     )
 
-    add_qt_resource(tst_qdatastream "testdata"
+    qt_add_resource(tst_qdatastream "testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt
index 55e8c164e5..91280c79b3 100644
--- a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdatastream_core_pixmap Test:
 #####################################################################
 
-add_qt_test(tst_qdatastream_core_pixmap
+qt_add_test(tst_qdatastream_core_pixmap
     SOURCES
         tst_qdatastream_core_pixmap.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt
index f377c97c2d..160b63f809 100644
--- a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## readAllStdinProcess Binary:
 #####################################################################
 
-add_qt_executable(readAllStdinProcess
+qt_add_executable(readAllStdinProcess
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readAllStdinProcess"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt
index ae899e55df..399e9f44a5 100644
--- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## readLineStdinProcess Binary:
 #####################################################################
 
-add_qt_executable(readLineStdinProcess
+qt_add_executable(readLineStdinProcess
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readLineStdinProcess"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
diff --git a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt
index fed74b64c2..3e5383fdc1 100644
--- a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## stdinProcess Binary:
 #####################################################################
 
-add_qt_executable(stdinProcess
+qt_add_executable(stdinProcess
     INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/stdinProcess"
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
index 52df750222..4471335770 100644
--- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
@@ -12,7 +12,7 @@ list(APPEND test_data "../tst_qtextstream.cpp")
 list(APPEND test_data "../resources")
 list(APPEND test_data "../BLACKLIST")
 
-add_qt_test(tst_qtextstream
+qt_add_test(tst_qtextstream
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../../../../../shared/emulationdetector.h
@@ -36,7 +36,7 @@ set(qtextstream_resource_files
     "resources/little_endian/"
 )
 
-add_qt_resource(tst_qtextstream "qtextstream"
+qt_add_resource(tst_qtextstream "qtextstream"
     PREFIX
         "/tst_textstream/"
     BASE
@@ -49,7 +49,7 @@ add_qt_resource(tst_qtextstream "qtextstream"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtextstream CONDITION builtin_testdata
+qt_extend_target(tst_qtextstream CONDITION builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt
index 0339b57c71..0039214d6b 100644
--- a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "data")
 list(APPEND test_data "XML-Test-Suite")
 
-add_qt_test(tst_qxmlstream
+qt_add_test(tst_qxmlstream
     SOURCES
         tst_qxmlstream.cpp
     PUBLIC_LIBRARIES