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>

60 files changed, 72 insertions, 72 deletions

diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt
index e1c5c1a469..08ff2a6798 100644
--- a/tests/auto/network/access/hpack/CMakeLists.txt
+++ b/tests/auto/network/access/hpack/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_hpack Test:
 #####################################################################
 
-add_qt_test(tst_hpack
+qt_add_test(tst_hpack
     SOURCES
         tst_hpack.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt
index 804ebedf61..323fb84bc7 100644
--- a/tests/auto/network/access/hsts/CMakeLists.txt
+++ b/tests/auto/network/access/hsts/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qhsts Test:
 #####################################################################
 
-add_qt_test(tst_qhsts
+qt_add_test(tst_qhsts
     SOURCES
         tst_qhsts.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt
index 51c7c18eac..ed5f7c8275 100644
--- a/tests/auto/network/access/http2/CMakeLists.txt
+++ b/tests/auto/network/access/http2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_http2 Test:
 #####################################################################
 
-add_qt_test(tst_http2
+qt_add_test(tst_http2
     SOURCES
         ../../../../shared/emulationdetector.h
         http2srv.cpp http2srv.h
diff --git a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
index 07128e40bb..3196ccca59 100644
--- a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
+++ b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     tests/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qabstractnetworkcache
+qt_add_test(tst_qabstractnetworkcache
     SOURCES
         tst_qabstractnetworkcache.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qftp/CMakeLists.txt b/tests/auto/network/access/qftp/CMakeLists.txt
index 877c3a229b..f67ddd3326 100644
--- a/tests/auto/network/access/qftp/CMakeLists.txt
+++ b/tests/auto/network/access/qftp/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 ## tst_qftp Test:
 #####################################################################
 
-add_qt_test(tst_qftp
+qt_add_test(tst_qftp
     SOURCES
         tst_qftp.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
index 6ab8876c82..621e339c1a 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
+++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qhttpnetworkconnection Test:
 #####################################################################
 
-add_qt_test(tst_qhttpnetworkconnection
+qt_add_test(tst_qhttpnetworkconnection
     SOURCES
         tst_qhttpnetworkconnection.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
index 8c68a18da6..f9ba96cf13 100644
--- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
+++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qhttpnetworkreply Test:
 #####################################################################
 
-add_qt_test(tst_qhttpnetworkreply
+qt_add_test(tst_qhttpnetworkreply
     SOURCES
         tst_qhttpnetworkreply.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
index 4b58c449c6..8fc928e8cf 100644
--- a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkaccessmanager Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkaccessmanager
+qt_add_test(tst_qnetworkaccessmanager
     SOURCES
         tst_qnetworkaccessmanager.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
index 08e80d8e0d..bcd47c7bcf 100644
--- a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkcachemetadata Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkcachemetadata
+qt_add_test(tst_qnetworkcachemetadata
     SOURCES
         tst_qnetworkcachemetadata.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
index ab90a61bb3..24446c90ef 100644
--- a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkcookie Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkcookie
+qt_add_test(tst_qnetworkcookie
     SOURCES
         tst_qnetworkcookie.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
index 929388a10a..f6aafcb69b 100644
--- a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "parser.json")
 
-add_qt_test(tst_qnetworkcookiejar
+qt_add_test(tst_qnetworkcookiejar
     SOURCES
         tst_qnetworkcookiejar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
index b206686139..484cb47e2b 100644
--- a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkdiskcache Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkdiskcache
+qt_add_test(tst_qnetworkdiskcache
     SOURCES
         tst_qnetworkdiskcache.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
index e43272d7e8..17b6b275c9 100644
--- a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## echo Binary:
 #####################################################################
 
-add_qt_executable(echo
+qt_add_executable(echo
     SOURCES
         main.cpp
 )
diff --git a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
index f260b97b8d..e06066ea4f 100644
--- a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## echo Binary:
 #####################################################################
 
-add_qt_executable(echo
+qt_add_executable(echo
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
         main.cpp
diff --git a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
index 9350c9afbf..19b430b159 100644
--- a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "../certs")
 list(APPEND test_data "../index.html")
 list(APPEND test_data "../smb-file.txt")
 
-add_qt_test(tst_qnetworkreply
+qt_add_test(tst_qnetworkreply
     SOURCES
         ../../../../../shared/emulationdetector.h
         ../tst_qnetworkreply.cpp
@@ -37,7 +37,7 @@ set(qnetworkreply_resource_files
     "resource"
 )
 
-add_qt_resource(tst_qnetworkreply "qnetworkreply"
+qt_add_resource(tst_qnetworkreply "qnetworkreply"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
index 50572444a1..568eb2adf6 100644
--- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND test_data "../certs")
 list(APPEND test_data "../index.html")
 list(APPEND test_data "../smb-file.txt")
 
-add_qt_test(tst_qnetworkreply
+qt_add_test(tst_qnetworkreply
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
     SOURCES
         ../../../../../shared/emulationdetector.h
@@ -38,7 +38,7 @@ set(qnetworkreply_resource_files
     "resource"
 )
 
-add_qt_resource(tst_qnetworkreply "qnetworkreply"
+qt_add_resource(tst_qnetworkreply "qnetworkreply"
     PREFIX
         "/"
     BASE
diff --git a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
index f089c5a43e..2334165c3a 100644
--- a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkrequest Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkrequest
+qt_add_test(tst_qnetworkrequest
     SOURCES
         tst_qnetworkrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt
index f461591884..a4d5d7f277 100644
--- a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt
+++ b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qauthenticator Test:
 #####################################################################
 
-add_qt_test(tst_qauthenticator
+qt_add_test(tst_qauthenticator
     SOURCES
         tst_qauthenticator.cpp
     DEFINES
diff --git a/tests/auto/network/kernel/qdnslookup/CMakeLists.txt b/tests/auto/network/kernel/qdnslookup/CMakeLists.txt
index 896b4431d8..6736b480b2 100644
--- a/tests/auto/network/kernel/qdnslookup/CMakeLists.txt
+++ b/tests/auto/network/kernel/qdnslookup/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdnslookup Test:
 #####################################################################
 
-add_qt_test(tst_qdnslookup
+qt_add_test(tst_qdnslookup
     SOURCES
         tst_qdnslookup.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt b/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt
index 847e1a6d90..1730879bd2 100644
--- a/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt
+++ b/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdnslookup_appless Test:
 #####################################################################
 
-add_qt_test(tst_qdnslookup_appless
+qt_add_test(tst_qdnslookup_appless
     SOURCES
         tst_qdnslookup_appless.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt
index f967625d38..c1999c8db2 100644
--- a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt
+++ b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qhostaddress Test:
 #####################################################################
 
-add_qt_test(tst_qhostaddress
+qt_add_test(tst_qhostaddress
     SOURCES
         tst_qhostaddress.cpp
     PUBLIC_LIBRARIES
@@ -14,7 +14,7 @@ add_qt_test(tst_qhostaddress
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qhostaddress CONDITION WIN32
+qt_extend_target(tst_qhostaddress CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
index 891312ae5e..b571718d25 100644
--- a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
+++ b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qhostinfo Test:
 #####################################################################
 
-add_qt_test(tst_qhostinfo
+qt_add_test(tst_qhostinfo
     SOURCES
         tst_qhostinfo.cpp
     PUBLIC_LIBRARIES
@@ -22,7 +22,7 @@ add_qt_test(tst_qhostinfo
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qhostinfo CONDITION WIN32
+qt_extend_target(tst_qhostinfo CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt b/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt
index 5a72d4e4a5..3dcfd2ac9b 100644
--- a/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkaddressentry Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkaddressentry
+qt_add_test(tst_qnetworkaddressentry
     SOURCES
         tst_qnetworkaddressentry.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt b/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt
index ae24d32917..4ae11ab146 100644
--- a/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkdatagram Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkdatagram
+qt_add_test(tst_qnetworkdatagram
     SOURCES
         tst_qnetworkdatagram.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
index f23a17f077..7bf840881a 100644
--- a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkinterface Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkinterface
+qt_add_test(tst_qnetworkinterface
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qnetworkinterface.cpp
diff --git a/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt
index e0cbe133af..4402ba4a72 100644
--- a/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkproxy Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkproxy
+qt_add_test(tst_qnetworkproxy
     SOURCES
         tst_qnetworkproxy.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt
index ecacd338ab..e8bc9beefb 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qnetworkproxyfactory Test:
 #####################################################################
 
-add_qt_test(tst_qnetworkproxyfactory
+qt_add_test(tst_qnetworkproxyfactory
     SOURCES
         tst_qnetworkproxyfactory.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
index bb29119011..780826f211 100644
--- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_platformsocketengine Test:
 #####################################################################
 
-add_qt_test(tst_platformsocketengine
+qt_add_test(tst_platformsocketengine
     SOURCES
         tst_platformsocketengine.cpp
     INCLUDE_DIRECTORIES
@@ -25,7 +25,7 @@ add_qt_test(tst_platformsocketengine
 ## Scopes:
 #####################################################################
 
-extend_target(tst_platformsocketengine CONDITION WIN32
+qt_extend_target(tst_platformsocketengine CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
index ca7d64a2ff..b5de9360c3 100644
--- a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qabstractsocket Test:
 #####################################################################
 
-add_qt_test(tst_qabstractsocket
+qt_add_test(tst_qabstractsocket
     SOURCES
         tst_qabstractsocket.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
index 22007a31d1..8afcdc3376 100644
--- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qhttpsocketengine Test:
 #####################################################################
 
-add_qt_test(tst_qhttpsocketengine
+qt_add_test(tst_qhttpsocketengine
     SOURCES
         tst_qhttpsocketengine.cpp
     INCLUDE_DIRECTORIES
@@ -28,7 +28,7 @@ add_qt_test(tst_qhttpsocketengine
 #### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX:
 # QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2"
 
-extend_target(tst_qhttpsocketengine CONDITION WIN32
+qt_extend_target(tst_qhttpsocketengine CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
index cb339eb2fa..5f382b114a 100644
--- a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## socketprocess Binary:
 #####################################################################
 
-add_qt_executable(socketprocess
+qt_add_executable(socketprocess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
index eb427796ae..02017adbca 100644
--- a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qlocalsocket Test:
 #####################################################################
 
-add_qt_test(tst_qlocalsocket
+qt_add_test(tst_qlocalsocket
     SOURCES
         ../tst_qlocalsocket.cpp
     DEFINES
diff --git a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
index d272d018b6..d2d849aa05 100644
--- a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsctpsocket Test:
 #####################################################################
 
-add_qt_test(tst_qsctpsocket
+qt_add_test(tst_qsctpsocket
     SOURCES
         tst_qsctpsocket.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
index 7c4a56031b..0b2430c81a 100644
--- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qsocks5socketengine Test:
 #####################################################################
 
-add_qt_test(tst_qsocks5socketengine
+qt_add_test(tst_qsocks5socketengine
     SOURCES
         tst_qsocks5socketengine.cpp
     INCLUDE_DIRECTORIES
@@ -28,7 +28,7 @@ add_qt_test(tst_qsocks5socketengine
 #### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX:
 # QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus"
 
-extend_target(tst_qsocks5socketengine CONDITION WIN32
+qt_extend_target(tst_qsocks5socketengine CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
index ad291f2ad8..fab02435a6 100644
--- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## crashingServer Binary:
 #####################################################################
 
-add_qt_executable(crashingServer
+qt_add_executable(crashingServer
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt
index df05c5012b..f80fdedcac 100644
--- a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtcpserver Test:
 #####################################################################
 
-add_qt_test(tst_qtcpserver
+qt_add_test(tst_qtcpserver
     SOURCES
         ../tst_qtcpserver.cpp
     PUBLIC_LIBRARIES
@@ -17,7 +17,7 @@ add_qt_test(tst_qtcpserver
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtcpserver CONDITION WIN32
+qt_extend_target(tst_qtcpserver CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
index b559024724..ae345b99f4 100644
--- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtcpserver Test:
 #####################################################################
 
-add_qt_test(tst_qtcpserver
+qt_add_test(tst_qtcpserver
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
     SOURCES
         ../tst_qtcpserver.cpp
@@ -18,7 +18,7 @@ add_qt_test(tst_qtcpserver
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtcpserver CONDITION WIN32
+qt_extend_target(tst_qtcpserver CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
index da9d3a324f..784cee453d 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## stressTest Binary:
 #####################################################################
 
-add_qt_executable(stressTest
+qt_add_executable(stressTest
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         Test.cpp Test.h
diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
index 61b8d25736..22a105887d 100644
--- a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtcpsocket Test:
 #####################################################################
 
-add_qt_test(tst_qtcpsocket
+qt_add_test(tst_qtcpsocket
     SOURCES
         ../tst_qtcpsocket.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ add_qt_test(tst_qtcpsocket
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtcpsocket CONDITION WIN32
+qt_extend_target(tst_qtcpsocket CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
index 2acb8b5948..3903670156 100644
--- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qtcpsocket Test:
 #####################################################################
 
-add_qt_test(tst_qtcpsocket
+qt_add_test(tst_qtcpsocket
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
     SOURCES
         ../tst_qtcpsocket.cpp
@@ -16,7 +16,7 @@ add_qt_test(tst_qtcpsocket
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtcpsocket CONDITION WIN32
+qt_extend_target(tst_qtcpsocket CONDITION WIN32
     PUBLIC_LIBRARIES
         ws2_32
 )
diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
index 8b594c6913..12fe8a453a 100644
--- a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## clientserver Binary:
 #####################################################################
 
-add_qt_executable(clientserver
+qt_add_executable(clientserver
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt
index f5ec5f50ce..4c393d67a8 100644
--- a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qudpsocket Test:
 #####################################################################
 
-add_qt_test(tst_qudpsocket
+qt_add_test(tst_qudpsocket
     SOURCES
         ../tst_qudpsocket.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
index 3c2df284fc..a2fa36b078 100644
--- a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qudpsocket Test:
 #####################################################################
 
-add_qt_test(tst_qudpsocket
+qt_add_test(tst_qudpsocket
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
     SOURCES
         ../tst_qudpsocket.cpp
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
index be9819466f..7796fbe476 100644
--- a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## udpServer Binary:
 #####################################################################
 
-add_qt_executable(udpServer
+qt_add_executable(udpServer
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
index d9da87126f..d4909f94b2 100644
--- a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## udpServer Binary:
 #####################################################################
 
-add_qt_executable(udpServer
+qt_add_executable(udpServer
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case
     SOURCES
         main.cpp
diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt
index aa9ff58012..a97a213603 100644
--- a/tests/auto/network/ssl/qasn1element/CMakeLists.txt
+++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qasn1element Test:
 #####################################################################
 
-add_qt_test(tst_qasn1element
+qt_add_test(tst_qasn1element
     SOURCES
         tst_qasn1element.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qdtls/CMakeLists.txt b/tests/auto/network/ssl/qdtls/CMakeLists.txt
index 77bf65f199..8072d8d0e0 100644
--- a/tests/auto/network/ssl/qdtls/CMakeLists.txt
+++ b/tests/auto/network/ssl/qdtls/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Collect test data
 list(APPEND test_data "certs")
 
-add_qt_test(tst_qdtls
+qt_add_test(tst_qdtls
     SOURCES
         tst_qdtls.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
index 827716c3b7..c08bf6150a 100644
--- a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
+++ b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdtlscookie Test:
 #####################################################################
 
-add_qt_test(tst_qdtlscookie
+qt_add_test(tst_qdtlscookie
     SOURCES
         tst_qdtlscookie.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt
index 399711f9a0..7997461004 100644
--- a/tests/auto/network/ssl/qocsp/CMakeLists.txt
+++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qocsp Test:
 #####################################################################
 
-add_qt_test(tst_qocsp
+qt_add_test(tst_qocsp
     SOURCES
         tst_qocsp.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
index e0997fc26e..1bb8b2f29b 100644
--- a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
+++ b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpassworddigestor Test:
 #####################################################################
 
-add_qt_test(tst_qpassworddigestor
+qt_add_test(tst_qpassworddigestor
     SOURCES
         tst_qpassworddigestor.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt
index 1509c2e809..c55b2a86a3 100644
--- a/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
     pkcs12/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qsslcertificate
+qt_add_test(tst_qsslcertificate
     SOURCES
         tst_qsslcertificate.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
index 4b8fefc499..7dd8fa00db 100644
--- a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
@@ -29,7 +29,7 @@ file(GLOB_RECURSE test_data_glob
     pkcs12/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qsslcertificate
+qt_add_test(tst_qsslcertificate
     SOURCES
         tst_qsslcertificate.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
index 44e0e78220..b6a2348fca 100644
--- a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsslcipher Test:
 #####################################################################
 
-add_qt_test(tst_qsslcipher
+qt_add_test(tst_qsslcipher
     SOURCES
         tst_qsslcipher.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
index f6785a6736..0beb896018 100644
--- a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
+++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qssldiffiehellmanparameters Test:
 #####################################################################
 
-add_qt_test(tst_qssldiffiehellmanparameters
+qt_add_test(tst_qssldiffiehellmanparameters
     SOURCES
         tst_qssldiffiehellmanparameters.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
index 4df88ff305..89ee2a1b91 100644
--- a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsslellipticcurve Test:
 #####################################################################
 
-add_qt_test(tst_qsslellipticcurve
+qt_add_test(tst_qsslellipticcurve
     SOURCES
         tst_qsslellipticcurve.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslerror/CMakeLists.txt b/tests/auto/network/ssl/qsslerror/CMakeLists.txt
index e8b07ab049..8324220b46 100644
--- a/tests/auto/network/ssl/qsslerror/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslerror/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qsslerror Test:
 #####################################################################
 
-add_qt_test(tst_qsslerror
+qt_add_test(tst_qsslerror
     SOURCES
         tst_qsslerror.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
index 04634d1997..e83f4c1f40 100644
--- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob
     rsa-*.pem)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qsslkey
+qt_add_test(tst_qsslkey
     SOURCES
         tst_qsslkey.cpp
     PUBLIC_LIBRARIES
@@ -25,7 +25,7 @@ add_qt_test(tst_qsslkey
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests
+qt_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::NetworkPrivate
diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
index 99ec2ad823..59ab6ff93a 100644
--- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 # Collect test data
 list(APPEND test_data "certs")
 
-add_qt_test(tst_qsslsocket
+qt_add_test(tst_qsslsocket
     SOURCES
         tst_qsslsocket.cpp
     DEFINES
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
index c377e0a46a..9a1beaeb76 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qsslsocket_onDemandCertificates_member Test:
 #####################################################################
 
-add_qt_test(tst_qsslsocket_onDemandCertificates_member
+qt_add_test(tst_qsslsocket_onDemandCertificates_member
     SOURCES
         tst_qsslsocket_onDemandCertificates_member.cpp
     DEFINES
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
index f3a3178879..f8d6735c20 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_qsslsocket_onDemandCertificates_static Test:
 #####################################################################
 
-add_qt_test(tst_qsslsocket_onDemandCertificates_static
+qt_add_test(tst_qsslsocket_onDemandCertificates_static
     SOURCES
         tst_qsslsocket_onDemandCertificates_static.cpp
     DEFINES