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>

5 files changed, 23 insertions, 23 deletions

diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
index 9dc2ea18bf..592ef6e513 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qmimedatabase-cache Test:
 #####################################################################
 
-add_qt_test(tst_qmimedatabase-cache
+qt_add_test(tst_qmimedatabase-cache
     SOURCES
         ../tst_qmimedatabase.h
         tst_qmimedatabase-cache.cpp
@@ -17,18 +17,18 @@ add_qt_test(tst_qmimedatabase-cache
 )
 
 # Resources:
-set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
     PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
 )
 set(mimetypes_resource_files
     "mime/packages/freedesktop.org.xml"
 )
 
-add_qt_resource(tst_qmimedatabase-cache "mimetypes"
+qt_add_resource(tst_qmimedatabase-cache "mimetypes"
     PREFIX
         "/qt-project.org/qmime/packages"
     BASE
-        "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
+        "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
     FILES
         ${mimetypes_resource_files}
 )
@@ -75,7 +75,7 @@ set(testdata_resource_files
     "yast2-metapackage-handler-mimetypes.xml"
 )
 
-add_qt_resource(tst_qmimedatabase-cache "testdata"
+qt_add_resource(tst_qmimedatabase-cache "testdata"
     PREFIX
         "/qt-project.org/qmime"
     BASE
@@ -91,7 +91,7 @@ add_qt_resource(tst_qmimedatabase-cache "testdata"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmimedatabase-cache CONDITION GCC
+qt_extend_target(tst_qmimedatabase-cache CONDITION GCC
     COMPILE_OPTIONS
         -W
         -Wall
@@ -101,7 +101,7 @@ extend_target(tst_qmimedatabase-cache CONDITION GCC
         -Wshadow
 )
 
-extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
+qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
     DEFINES
         USE_XDG_DATA_DIRS
 )
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
index 7720e4d18e..e47d721f54 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qmimedatabase-cache Test:
 #####################################################################
 
-add_qt_test(tst_qmimedatabase-cache
+qt_add_test(tst_qmimedatabase-cache
     SOURCES
         ../tst_qmimedatabase.h
         tst_qmimedatabase-cache.cpp
@@ -66,7 +66,7 @@ set(testdata_resource_files
     "yast2-metapackage-handler-mimetypes.xml"
 )
 
-add_qt_resource(tst_qmimedatabase-cache "testdata"
+qt_add_resource(tst_qmimedatabase-cache "testdata"
     PREFIX
         "/qt-project.org/qmime"
     BASE
@@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-cache)
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmimedatabase-cache CONDITION GCC
+qt_extend_target(tst_qmimedatabase-cache CONDITION GCC
     COMPILE_OPTIONS
         -W
         -Wall
@@ -97,7 +97,7 @@ extend_target(tst_qmimedatabase-cache CONDITION GCC
         -Wshadow
 )
 
-extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
+qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
     DEFINES
         USE_XDG_DATA_DIRS
 )
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
index 1672255d29..d449343e56 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qmimedatabase-xml Test:
 #####################################################################
 
-add_qt_test(tst_qmimedatabase-xml
+qt_add_test(tst_qmimedatabase-xml
     SOURCES
         ../tst_qmimedatabase.h
         tst_qmimedatabase-xml.cpp
@@ -17,18 +17,18 @@ add_qt_test(tst_qmimedatabase-xml
 )
 
 # Resources:
-set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
     PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
 )
 set(mimetypes_resource_files
     "mime/packages/freedesktop.org.xml"
 )
 
-add_qt_resource(tst_qmimedatabase-xml "mimetypes"
+qt_add_resource(tst_qmimedatabase-xml "mimetypes"
     PREFIX
         "/qt-project.org/qmime/packages"
     BASE
-        "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
+        "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
     FILES
         ${mimetypes_resource_files}
 )
@@ -75,7 +75,7 @@ set(testdata_resource_files
     "yast2-metapackage-handler-mimetypes.xml"
 )
 
-add_qt_resource(tst_qmimedatabase-xml "testdata"
+qt_add_resource(tst_qmimedatabase-xml "testdata"
     PREFIX
         "/qt-project.org/qmime"
     BASE
@@ -91,7 +91,7 @@ add_qt_resource(tst_qmimedatabase-xml "testdata"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmimedatabase-xml CONDITION GCC
+qt_extend_target(tst_qmimedatabase-xml CONDITION GCC
     COMPILE_OPTIONS
         -W
         -Wall
@@ -101,7 +101,7 @@ extend_target(tst_qmimedatabase-xml CONDITION GCC
         -Wshadow
 )
 
-extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
+qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
     DEFINES
         USE_XDG_DATA_DIRS
 )
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
index cf8e349226..45770cf247 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qmimedatabase-xml Test:
 #####################################################################
 
-add_qt_test(tst_qmimedatabase-xml
+qt_add_test(tst_qmimedatabase-xml
     SOURCES
         ../tst_qmimedatabase.h
         tst_qmimedatabase-xml.cpp
@@ -66,7 +66,7 @@ set(testdata_resource_files
     "yast2-metapackage-handler-mimetypes.xml"
 )
 
-add_qt_resource(tst_qmimedatabase-xml "testdata"
+qt_add_resource(tst_qmimedatabase-xml "testdata"
     PREFIX
         "/qt-project.org/qmime"
     BASE
@@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-xml)
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmimedatabase-xml CONDITION GCC
+qt_extend_target(tst_qmimedatabase-xml CONDITION GCC
     COMPILE_OPTIONS
         -W
         -Wall
@@ -97,7 +97,7 @@ extend_target(tst_qmimedatabase-xml CONDITION GCC
         -Wshadow
 )
 
-extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
+qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
     DEFINES
         USE_XDG_DATA_DIRS
 )
diff --git a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
index 990835c86a..7637ef5d2d 100644
--- a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmimetype Test:
 #####################################################################
 
-add_qt_test(tst_qmimetype
+qt_add_test(tst_qmimetype
     SOURCES
         tst_qmimetype.cpp
     PUBLIC_LIBRARIES