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>

31 files changed, 49 insertions, 49 deletions

diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt
index cb1eba8526..6e9a3cbae8 100644
--- a/tests/auto/corelib/io/largefile/CMakeLists.txt
+++ b/tests/auto/corelib/io/largefile/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_largefile Test:
 #####################################################################
 
-add_qt_test(tst_largefile
+qt_add_test(tst_largefile
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_largefile.cpp
diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
index 1b7a11d657..8267c7241c 100644
--- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
+++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractfileengine Test:
 #####################################################################
 
-add_qt_test(tst_qabstractfileengine
+qt_add_test(tst_qabstractfileengine
     SOURCES
         tst_qabstractfileengine.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(qabstractfileengine_resource_files
     "resources/"
 )
 
-add_qt_resource(tst_qabstractfileengine "qabstractfileengine"
+qt_add_resource(tst_qabstractfileengine "qabstractfileengine"
     PREFIX
         "/tst_qabstractfileengine/"
     FILES
diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
index 40502dd004..5a374173ef 100644
--- a/tests/auto/corelib/io/qbuffer/CMakeLists.txt
+++ b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qbuffer Test:
 #####################################################################
 
-add_qt_test(tst_qbuffer
+qt_add_test(tst_qbuffer
     SOURCES
         tst_qbuffer.cpp
 )
diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
index 507852a11e..8020879311 100644
--- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdataurl Test:
 #####################################################################
 
-add_qt_test(tst_qdataurl
+qt_add_test(tst_qdataurl
     SOURCES
         tst_qdataurl.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt
index d7fa4fb7cd..6656b6089b 100644
--- a/tests/auto/corelib/io/qdebug/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdebug Test:
 #####################################################################
 
-add_qt_test(tst_qdebug
+qt_add_test(tst_qdebug
     SOURCES
         tst_qdebug.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt
index f77185bc2b..49711da087 100644
--- a/tests/auto/corelib/io/qdir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND test_data "entrylist")
 list(APPEND test_data "types")
 list(APPEND test_data "tst_qdir.cpp")
 
-add_qt_test(tst_qdir
+qt_add_test(tst_qdir
     SOURCES
         tst_qdir.cpp
     PUBLIC_LIBRARIES
@@ -26,7 +26,7 @@ set(qdir_resource_files
     "resources/entryList/"
 )
 
-add_qt_resource(tst_qdir "qdir"
+qt_add_resource(tst_qdir "qdir"
     PREFIX
         "/tst_qdir/"
     FILES
@@ -40,7 +40,7 @@ add_qt_resource(tst_qdir "qdir"
 #### Keys ignored in scope 2:.:.:qdir.pro:IOS:
 # QMAKE_INFO_PLIST = "Info.plist"
 
-extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
+qt_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
@@ -90,7 +90,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "types/f/dummy"
     )
 
-    add_qt_resource(tst_qdir "android_testdata"
+    qt_add_resource(tst_qdir "android_testdata"
         PREFIX
             "/android_testdata"
         FILES
diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
index e50fcb60ca..19e64e037c 100644
--- a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qdir Binary:
 #####################################################################
 
-add_qt_executable(qdir
+qt_add_executable(qdir
     GUI
     DEFINES
         QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
index 2e120b4621..39703e8c83 100644
--- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "entrylist")
 
-add_qt_test(tst_qdiriterator
+qt_add_test(tst_qdiriterator
     SOURCES
         tst_qdiriterator.cpp
     PUBLIC_LIBRARIES
@@ -21,7 +21,7 @@ set(qdiriterator_resource_files
     "entrylist/file"
 )
 
-add_qt_resource(tst_qdiriterator "qdiriterator"
+qt_add_resource(tst_qdiriterator "qdiriterator"
     PREFIX
         "/testdata/"
     FILES
@@ -32,7 +32,7 @@ add_qt_resource(tst_qdiriterator "qdiriterator"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
+qt_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
index 994c2fc268..eb1f6a0ff0 100644
--- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## stdinprocess_helper Binary:
 #####################################################################
 
-add_qt_test_helper(stdinprocess_helper
+qt_add_test_helper(stdinprocess_helper
     SOURCES
         main.cpp
 )
diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
index 05a14d4e1a..a7ccda9c58 100644
--- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfileinfo Test:
 #####################################################################
 
-add_qt_test(tst_qfileinfo
+qt_add_test(tst_qfileinfo
     SOURCES
         tst_qfileinfo.cpp
     PUBLIC_LIBRARIES
@@ -16,7 +16,7 @@ set(qfileinfo_resource_files
     "resources/"
 )
 
-add_qt_resource(tst_qfileinfo "qfileinfo"
+qt_add_resource(tst_qfileinfo "qfileinfo"
     PREFIX
         "/tst_qfileinfo/"
     FILES
@@ -29,7 +29,7 @@ set(testdata_resource_files
     "tst_qfileinfo.cpp"
 )
 
-add_qt_resource(tst_qfileinfo "testdata"
+qt_add_resource(tst_qfileinfo "testdata"
     PREFIX
         "/testdata"
     FILES
@@ -40,7 +40,7 @@ add_qt_resource(tst_qfileinfo "testdata"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qfileinfo CONDITION WIN32
+qt_extend_target(tst_qfileinfo CONDITION WIN32
     PUBLIC_LIBRARIES
         advapi32
         netapi32
diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
index e989315bdd..a99884b617 100644
--- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfilesystementry Test:
 #####################################################################
 
-add_qt_test(tst_qfilesystementry
+qt_add_test(tst_qfilesystementry
     SOURCES
         ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h
         tst_qfilesystementry.cpp
diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
index a237090a48..4970e5a426 100644
--- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfilesystemmetadata Test:
 #####################################################################
 
-add_qt_test(tst_qfilesystemmetadata
+qt_add_test(tst_qfilesystemmetadata
     SOURCES
         tst_qfilesystemmetadata.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
index 1dfef5acab..ac72470019 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qfilesystemwatcher Test:
 #####################################################################
 
-add_qt_test(tst_qfilesystemwatcher
+qt_add_test(tst_qfilesystemwatcher
     SOURCES
         tst_qfilesystemwatcher.cpp
 )
diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
index 6b7833ac22..fdc896e45d 100644
--- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt
+++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "tst_qiodevice.cpp")
 
-add_qt_test(tst_qiodevice
+qt_add_test(tst_qiodevice
     SOURCES
         tst_qiodevice.cpp
     PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "tst_qiodevice.cpp"
     )
 
-    add_qt_resource(tst_qiodevice "android_testdata"
+    qt_add_resource(tst_qiodevice "android_testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
index 821cd58bdb..da7f5a9061 100644
--- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt
+++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qipaddress Test:
 #####################################################################
 
-add_qt_test(tst_qipaddress
+qt_add_test(tst_qipaddress
     SOURCES
         tst_qipaddress.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
index 755dc7cf39..e0f500f8ae 100644
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlockfile_test_helper Binary:
 #####################################################################
 
-add_qt_executable(qlockfile_test_helper
+qt_add_executable(qlockfile_test_helper
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         qlockfile_test_helper.cpp
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
index b515037d56..957d60ca1b 100644
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlockfile_test_helper Binary:
 #####################################################################
 
-add_qt_test_helper(qlockfile_test_helper # special case
+qt_add_test_helper(qlockfile_test_helper # special case
     OVERRIDE_OUTPUT_DIRECTORY # special case
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
index 9e1eaf3e4a..778315db5b 100644
--- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qloggingcategory Test:
 #####################################################################
 
-add_qt_test(tst_qloggingcategory
+qt_add_test(tst_qloggingcategory
     SOURCES
         tst_qloggingcategory.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
index 3c42af9d01..e4d1cf4aaf 100644
--- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "qtlogging.ini")
 
-add_qt_test(tst_qloggingregistry
+qt_add_test(tst_qloggingregistry
     SOURCES
         tst_qloggingregistry.cpp
     PUBLIC_LIBRARIES
@@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "qtlogging.ini"
     )
 
-    add_qt_resource(tst_qloggingregistry "android_testdata"
+    qt_add_resource(tst_qloggingregistry "android_testdata"
         PREFIX
             "/"
         FILES
diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
index 4d1b57e222..fe410643fc 100644
--- a/tests/auto/corelib/io/qnodebug/CMakeLists.txt
+++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnodebug Test:
 #####################################################################
 
-add_qt_test(tst_qnodebug
+qt_add_test(tst_qnodebug
     SOURCES
         tst_qnodebug.cpp
 )
diff --git a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
index ce6195fc37..ae7910e302 100644
--- a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qprocess-noapplication Test:
 #####################################################################
 
-add_qt_test(qprocess-noapplication
+qt_add_test(qprocess-noapplication
     SOURCES
         tst_qprocessnoapplication.cpp
 )
diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
index dbcd8c8172..ba935455af 100644
--- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qprocessenvironment Test:
 #####################################################################
 
-add_qt_test(tst_qprocessenvironment
+qt_add_test(tst_qprocessenvironment
     SOURCES
         tst_qprocessenvironment.cpp
 )
diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
index aec5da1f99..f2c8cf0a56 100644
--- a/tests/auto/corelib/io/qsavefile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "tst_qsavefile.cpp")
 
-add_qt_test(tst_qsavefile
+qt_add_test(tst_qsavefile
     SOURCES
         tst_qsavefile.cpp
     TESTDATA ${test_data}
diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt
index 161b03b041..3cc9547d3c 100644
--- a/tests/auto/corelib/io/qsettings/CMakeLists.txt
+++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsettings Test:
 #####################################################################
 
-add_qt_test(tst_qsettings
+qt_add_test(tst_qsettings
     SOURCES
         tst_qsettings.cpp
     DEFINES
@@ -28,7 +28,7 @@ set(qsettings_resource_files
     "withcomments.ini"
 )
 
-add_qt_resource(tst_qsettings "qsettings"
+qt_add_resource(tst_qsettings "qsettings"
     PREFIX
         "/"
     FILES
@@ -39,12 +39,12 @@ add_qt_resource(tst_qsettings "qsettings"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qsettings CONDITION MSVC
+qt_extend_target(tst_qsettings CONDITION MSVC
     PUBLIC_LIBRARIES
         advapi32
 )
 
-extend_target(tst_qsettings CONDITION APPLE
+qt_extend_target(tst_qsettings CONDITION APPLE
     PUBLIC_LIBRARIES
         ${FWCoreFoundation}
 )
diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
index 5bceaf1d77..be03b3e986 100644
--- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
+++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
@@ -8,7 +8,7 @@
 list(APPEND test_data "tst_qstandardpaths.cpp")
 list(APPEND test_data "qstandardpaths.pro")
 
-add_qt_test(tst_qstandardpaths
+qt_add_test(tst_qstandardpaths
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qstandardpaths.cpp
@@ -20,7 +20,7 @@ add_qt_test(tst_qstandardpaths
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qstandardpaths CONDITION boot2qt
+qt_extend_target(tst_qstandardpaths CONDITION boot2qt
     DEFINES
         SKIP_FINDEXECUTABLE
 )
diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
index 08af02dc6c..e2a47a2832 100644
--- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
+++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qstorageinfo Test:
 #####################################################################
 
-add_qt_test(tst_qstorageinfo
+qt_add_test(tst_qstorageinfo
     SOURCES
         tst_qstorageinfo.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
index 855495bbbb..f1c3db54d0 100644
--- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtemporarydir Test:
 #####################################################################
 
-add_qt_test(tst_qtemporarydir
+qt_add_test(tst_qtemporarydir
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qtemporarydir.cpp
diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
index af614552cc..9b35f72a69 100644
--- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "tst_qtemporaryfile.cpp")
 
-add_qt_test(tst_qtemporaryfile
+qt_add_test(tst_qtemporaryfile
     SOURCES
         tst_qtemporaryfile.cpp
     PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ set(qtemporaryfile_resource_files
     "resources/test.txt"
 )
 
-add_qt_resource(tst_qtemporaryfile "qtemporaryfile"
+qt_add_resource(tst_qtemporaryfile "qtemporaryfile"
     PREFIX
         "/"
     FILES
@@ -38,7 +38,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "tst_qtemporaryfile.cpp"
     )
 
-    add_qt_resource(tst_qtemporaryfile "android_testdata"
+    qt_add_resource(tst_qtemporaryfile "android_testdata"
         PREFIX
             "/android_testdata"
         FILES
diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt
index c23ad27cfc..2ea06f62d7 100644
--- a/tests/auto/corelib/io/qurl/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qurl Test:
 #####################################################################
 
-add_qt_test(tst_qurl
+qt_add_test(tst_qurl
     SOURCES
         tst_qurl.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qurl
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qurl CONDITION APPLE
+qt_extend_target(tst_qurl CONDITION APPLE
     SOURCES
         tst_qurl_mac.mm
 )
diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
index 3225f7d308..80f8e0d128 100644
--- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qurlinternal Test:
 #####################################################################
 
-add_qt_test(tst_qurlinternal
+qt_add_test(tst_qurlinternal
     SOURCES
         tst_qurlinternal.cpp
         utf8data.cpp
diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
index 8a0cc54aeb..b85e688b45 100644
--- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qurlquery Test:
 #####################################################################
 
-add_qt_test(tst_qurlquery
+qt_add_test(tst_qurlquery
     SOURCES
         tst_qurlquery.cpp
     DEFINES