Regenerate projectswip/cmake

Change-Id: I08414933bad2e94f8f9a12ac7372570e838e31cd
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

66 files changed, 82 insertions, 97 deletions

diff --git a/examples/remoteobjects/cppclient/CMakeLists.txt b/examples/remoteobjects/cppclient/CMakeLists.txt
index 980fd34..3bea6a8 100644
--- a/examples/remoteobjects/cppclient/CMakeLists.txt
+++ b/examples/remoteobjects/cppclient/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples/remoteobjects/cppclient")
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS RemoteObjects)
 
-add_qt_gui_executable(CppClient
+add_executable(CppClient
     main.cpp
 )
 target_link_libraries(CppClient PUBLIC
diff --git a/examples/remoteobjects/modelviewclient/CMakeLists.txt b/examples/remoteobjects/modelviewclient/CMakeLists.txt
index 62af95f..8b60772 100644
--- a/examples/remoteobjects/modelviewclient/CMakeLists.txt
+++ b/examples/remoteobjects/modelviewclient/CMakeLists.txt
@@ -16,7 +16,7 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS RemoteObjects)
 
-add_qt_gui_executable(modelviewclient
+add_executable(modelviewclient
     main.cpp
 )
 target_link_libraries(modelviewclient PUBLIC
diff --git a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
index 47e40c5..49e9d87 100644
--- a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
+++ b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples/remoteobjects/ssl/sslcppclient")
 find_package(Qt6 COMPONENTS RemoteObjects)
 find_package(Qt6 COMPONENTS Core)
 
-add_qt_gui_executable(SslCppClient
+add_executable(SslCppClient
     main.cpp
 )
 target_link_libraries(SslCppClient PRIVATE
diff --git a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
index fbf0344..4deaed3 100644
--- a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
+++ b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS RemoteObjects)
 find_package(Qt6 COMPONENTS WebSockets)
 
-add_qt_gui_executable(wsclient
+add_executable(wsclient
     ../common/websocketiodevice.cpp ../common/websocketiodevice.h
     main.cpp
 )
diff --git a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
index 2ed3a30..1ce18e2 100644
--- a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
+++ b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS RemoteObjects)
 find_package(Qt6 COMPONENTS WebSockets)
 
-add_qt_gui_executable(wsserver
+add_executable(wsserver
     ../common/websocketiodevice.cpp ../common/websocketiodevice.h
     main.cpp
 )
diff --git a/src/imports/compat/CMakeLists.txt b/src/imports/compat/CMakeLists.txt
index b05b54d..f275bf7 100644
--- a/src/imports/compat/CMakeLists.txt
+++ b/src/imports/compat/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtqmlremoteobjects Plugin:
 #####################################################################
 
-add_qml_module(qtqmlremoteobjects
+qt_add_qml_module(qtqmlremoteobjects
     URI "QtQml.RemoteObjects"
     VERSION "1.0"
     CLASSNAME QtQmlRemoteObjectsPlugin
@@ -22,4 +22,3 @@ add_qml_module(qtqmlremoteobjects
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.0"
 # TARGETPATH = "QtQml/RemoteObjects"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/remoteobjects/.prev_CMakeLists.txt b/src/imports/remoteobjects/.prev_CMakeLists.txt
index b6cff4c..e7baf77 100644
--- a/src/imports/remoteobjects/.prev_CMakeLists.txt
+++ b/src/imports/remoteobjects/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtremoteobjects Plugin:
 #####################################################################
 
-add_qml_module(qtremoteobjects
+qt_add_qml_module(qtremoteobjects
     URI "QtRemoteObjects"
     VERSION "5.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QtRemoteObjectsPlugin
@@ -24,4 +24,3 @@ add_qml_module(qtremoteobjects
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "5.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtRemoteObjects"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/remoteobjects/CMakeLists.txt b/src/imports/remoteobjects/CMakeLists.txt
index 25f84d2..2c84b0c 100644
--- a/src/imports/remoteobjects/CMakeLists.txt
+++ b/src/imports/remoteobjects/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qtremoteobjects Plugin:
 #####################################################################
 
-add_qml_module(qtremoteobjects
+qt_add_qml_module(qtremoteobjects
     URI "QtRemoteObjects"
     VERSION "${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}" # special case
     CLASSNAME QtRemoteObjectsPlugin
@@ -24,4 +24,3 @@ add_qml_module(qtremoteobjects
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "5.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtRemoteObjects"
-# _LOADED = "qml_plugin"
diff --git a/src/remoteobjects/.prev_CMakeLists.txt b/src/remoteobjects/.prev_CMakeLists.txt
index 3c65735..88af4e0 100644
--- a/src/remoteobjects/.prev_CMakeLists.txt
+++ b/src/remoteobjects/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## RemoteObjects Module:
 #####################################################################
 
-add_qt_module(RemoteObjects
+qt_add_module(RemoteObjects
     QMAKE_MODULE_CONFIG remoteobjects_repc
     SOURCES
         qconnection_local_backend.cpp qconnection_local_backend_p.h
@@ -43,12 +43,11 @@ add_qt_module(RemoteObjects
 # MODULE = "remoteobjects"
 # MODULE_CONFIG = "remoteobjects_repc"
 # OTHER_FILES = "doc/qtremoteobjects.qdocconf" "doc/src/remoteobjects-cpp.qdoc" "doc/src/remoteobjects-index.qdoc" "doc/src/remoteobjects-overview.qdoc" "doc/src/remoteobjects-repc.qdoc"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(RemoteObjects CONDITION QNX
+qt_extend_target(RemoteObjects CONDITION QNX
     SOURCES
         qconnection_qnx_backend.cpp qconnection_qnx_backend_p.h
         qconnection_qnx_global_p.h
@@ -56,11 +55,11 @@ extend_target(RemoteObjects CONDITION QNX
         qconnection_qnx_server.cpp qconnection_qnx_server.h qconnection_qnx_server_p.h
 )
 
-extend_target(RemoteObjects CONDITION (QNX) AND (DEFINES ___contains___USE_HAM)
+qt_extend_target(RemoteObjects CONDITION (QNX) AND (DEFINES ___contains___USE_HAM)
     PUBLIC_LIBRARIES
         ham
 )
-add_qt_docs(RemoteObjects
+qt_add_docs(RemoteObjects
     doc/qtremoteobjects.qdocconf
 )
 
diff --git a/src/remoteobjects/CMakeLists.txt b/src/remoteobjects/CMakeLists.txt
index 1edefa6..94c5bed 100644
--- a/src/remoteobjects/CMakeLists.txt
+++ b/src/remoteobjects/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## RemoteObjects Module:
 #####################################################################
 
-add_qt_module(RemoteObjects
+qt_add_module(RemoteObjects
     QMAKE_MODULE_CONFIG remoteobjects_repc
     SOURCES
         qconnection_local_backend.cpp qconnection_local_backend_p.h
@@ -43,12 +43,11 @@ add_qt_module(RemoteObjects
 # MODULE = "remoteobjects"
 # MODULE_CONFIG = "remoteobjects_repc"
 # OTHER_FILES = "doc/qtremoteobjects.qdocconf" "doc/src/remoteobjects-cpp.qdoc" "doc/src/remoteobjects-index.qdoc" "doc/src/remoteobjects-overview.qdoc" "doc/src/remoteobjects-repc.qdoc"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(RemoteObjects CONDITION QNX
+qt_extend_target(RemoteObjects CONDITION QNX
     SOURCES
         qconnection_qnx_backend.cpp qconnection_qnx_backend_p.h
         qconnection_qnx_global_p.h
@@ -56,11 +55,11 @@ extend_target(RemoteObjects CONDITION QNX
         qconnection_qnx_server.cpp qconnection_qnx_server.h qconnection_qnx_server_p.h
 )
 
-extend_target(RemoteObjects CONDITION (QNX) AND (DEFINES ___contains___USE_HAM)
+qt_extend_target(RemoteObjects CONDITION (QNX) AND (DEFINES ___contains___USE_HAM)
     PUBLIC_LIBRARIES
         ham
 )
-add_qt_docs(RemoteObjects
+qt_add_docs(RemoteObjects
     doc/qtremoteobjects.qdocconf
 )
 
diff --git a/src/repparser/.prev_CMakeLists.txt b/src/repparser/.prev_CMakeLists.txt
index a8100e3..d6b8abd 100644
--- a/src/repparser/.prev_CMakeLists.txt
+++ b/src/repparser/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## RepParser Module:
 #####################################################################
 
-add_qt_module(RepParser
+qt_add_module(RepParser
     HEADER_MODULE
     SOURCES
         qregexparser.h
@@ -14,7 +14,6 @@ add_qt_module(RepParser
 
 #### Keys ignored in scope 1:.:.:repparser.pro:<TRUE>:
 # MODULE = "repparser"
-# _LOADED = "qt_module"
 # def_build = "debug"
 
 ## Scopes:
diff --git a/src/repparser/CMakeLists.txt b/src/repparser/CMakeLists.txt
index 02f88be..dc1a9d1 100644
--- a/src/repparser/CMakeLists.txt
+++ b/src/repparser/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## RepParser Module:
 #####################################################################
 
-add_qt_module(RepParser
+qt_add_module(RepParser
     HEADER_MODULE
     SOURCES
         # qregexparser.h          # special case
@@ -14,7 +14,6 @@ add_qt_module(RepParser
 
 #### Keys ignored in scope 1:.:.:repparser.pro:<TRUE>:
 # MODULE = "repparser"
-# _LOADED = "qt_module"
 # def_build = "debug"
 
 ## Scopes:
diff --git a/tests/auto/benchmarks/.prev_CMakeLists.txt b/tests/auto/benchmarks/.prev_CMakeLists.txt
index 7df7b4d..901a80d 100644
--- a/tests/auto/benchmarks/.prev_CMakeLists.txt
+++ b/tests/auto/benchmarks/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_benchmarkstest Test:
 #####################################################################
 
-add_qt_test(tst_benchmarkstest
+qt_add_test(tst_benchmarkstest
     SOURCES
         tst_benchmarkstest.cpp
     DEFINES
diff --git a/tests/auto/benchmarks/CMakeLists.txt b/tests/auto/benchmarks/CMakeLists.txt
index 482b15a..83fc966 100644
--- a/tests/auto/benchmarks/CMakeLists.txt
+++ b/tests/auto/benchmarks/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_benchmarkstest Test:
 #####################################################################
 
-add_qt_test(tst_benchmarkstest
+qt_add_test(tst_benchmarkstest
     SOURCES
         tst_benchmarkstest.cpp
     DEFINES
diff --git a/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt b/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt
index f97fd5a..4321a07 100644
--- a/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt
+++ b/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## sslTestServer Binary:
 #####################################################################
 
-add_qt_executable(sslTestServer
+qt_add_executable(sslTestServer
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
@@ -49,7 +49,7 @@ set(cert_resource_files
     "server.key"
 )
 
-add_qt_resource(sslTestServer "cert"
+qt_add_resource(sslTestServer "cert"
     PREFIX
         "/sslcert"
     BASE
diff --git a/tests/auto/external_IODevice/tst_client/CMakeLists.txt b/tests/auto/external_IODevice/tst_client/CMakeLists.txt
index 5d756bc..bfd150b 100644
--- a/tests/auto/external_IODevice/tst_client/CMakeLists.txt
+++ b/tests/auto/external_IODevice/tst_client/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_external_IODevice Test:
 #####################################################################
 
-add_qt_test(tst_external_IODevice
+qt_add_test(tst_external_IODevice
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         tst_client.cpp
@@ -44,7 +44,7 @@ set(cert_resource_files
     "server.key"
 )
 
-add_qt_resource(tst_external_IODevice "cert"
+qt_add_resource(tst_external_IODevice "cert"
     PREFIX
         "/sslcert"
     BASE
diff --git a/tests/auto/integration/.prev_CMakeLists.txt b/tests/auto/integration/.prev_CMakeLists.txt
index 3821b93..8e32209 100644
--- a/tests/auto/integration/.prev_CMakeLists.txt
+++ b/tests/auto/integration/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_integration Test:
 #####################################################################
 
-add_qt_test(tst_integration
+qt_add_test(tst_integration
     SOURCES
         engine.cpp engine.h
         speedometer.cpp speedometer.h
diff --git a/tests/auto/integration/CMakeLists.txt b/tests/auto/integration/CMakeLists.txt
index aa4748f..ff96745 100644
--- a/tests/auto/integration/CMakeLists.txt
+++ b/tests/auto/integration/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_integration Test:
 #####################################################################
 
-add_qt_test(tst_integration
+qt_add_test(tst_integration
     SOURCES
         engine.cpp engine.h
         speedometer.cpp speedometer.h
diff --git a/tests/auto/integration_external/client/CMakeLists.txt b/tests/auto/integration_external/client/CMakeLists.txt
index 6d9c84f..551acb9 100644
--- a/tests/auto/integration_external/client/CMakeLists.txt
+++ b/tests/auto/integration_external/client/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## integration_external_client Binary:
 #####################################################################
 
-add_qt_executable(integration_external_client
+qt_add_executable(integration_external_client
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/integration_external/external/CMakeLists.txt b/tests/auto/integration_external/external/CMakeLists.txt
index b8af392..c29e37e 100644
--- a/tests/auto/integration_external/external/CMakeLists.txt
+++ b/tests/auto/integration_external/external/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_integration_external Test:
 #####################################################################
 
-add_qt_test(tst_integration_external
+qt_add_test(tst_integration_external
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         tst_integration_external.cpp
diff --git a/tests/auto/integration_external/server/CMakeLists.txt b/tests/auto/integration_external/server/CMakeLists.txt
index 4da33a4..c7f0025 100644
--- a/tests/auto/integration_external/server/CMakeLists.txt
+++ b/tests/auto/integration_external/server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## integration_external_server Binary:
 #####################################################################
 
-add_qt_executable(integration_external_server
+qt_add_executable(integration_external_server
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/integration_multiprocess/client/CMakeLists.txt b/tests/auto/integration_multiprocess/client/CMakeLists.txt
index 9234365..c85e351 100644
--- a/tests/auto/integration_multiprocess/client/CMakeLists.txt
+++ b/tests/auto/integration_multiprocess/client/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## integration_multiprocess_client Binary:
 #####################################################################
 
-add_qt_executable(integration_multiprocess_client
+qt_add_executable(integration_multiprocess_client
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/integration_multiprocess/server/CMakeLists.txt b/tests/auto/integration_multiprocess/server/CMakeLists.txt
index dc2358c..5981c8b 100644
--- a/tests/auto/integration_multiprocess/server/CMakeLists.txt
+++ b/tests/auto/integration_multiprocess/server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## integration_multiprocess_server Binary:
 #####################################################################
 
-add_qt_executable(integration_multiprocess_server
+qt_add_executable(integration_multiprocess_server
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/integration_multiprocess/tst/CMakeLists.txt b/tests/auto/integration_multiprocess/tst/CMakeLists.txt
index 3c737e9..236b1ef 100644
--- a/tests/auto/integration_multiprocess/tst/CMakeLists.txt
+++ b/tests/auto/integration_multiprocess/tst/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_integration_multiprocess Test:
 #####################################################################
 
-add_qt_test(tst_integration_multiprocess
+qt_add_test(tst_integration_multiprocess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         tst_integration_multiprocess.cpp
diff --git a/tests/auto/localsockettestserver/.prev_CMakeLists.txt b/tests/auto/localsockettestserver/.prev_CMakeLists.txt
index 5575817..8486704 100644
--- a/tests/auto/localsockettestserver/.prev_CMakeLists.txt
+++ b/tests/auto/localsockettestserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## localsockettestserver Binary:
 #####################################################################
 
-add_qt_executable(localsockettestserver
+qt_add_executable(localsockettestserver
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/localsockettestserver/CMakeLists.txt b/tests/auto/localsockettestserver/CMakeLists.txt
index 8d13bee..ad43434 100644
--- a/tests/auto/localsockettestserver/CMakeLists.txt
+++ b/tests/auto/localsockettestserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## localsockettestserver Binary:
 #####################################################################
 
-add_qt_executable(localsockettestserver
+qt_add_executable(localsockettestserver
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/modelreplica/CMakeLists.txt b/tests/auto/modelreplica/CMakeLists.txt
index c0a23d3..610aa9b 100644
--- a/tests/auto/modelreplica/CMakeLists.txt
+++ b/tests/auto/modelreplica/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_modelreplicatest Test:
 #####################################################################
 
-add_qt_test(tst_modelreplicatest
+qt_add_test(tst_modelreplicatest
     SOURCES
         tst_modelreplicatest.cpp
     DEFINES
diff --git a/tests/auto/modelview/CMakeLists.txt b/tests/auto/modelview/CMakeLists.txt
index 829d62e..d5b1c51 100644
--- a/tests/auto/modelview/CMakeLists.txt
+++ b/tests/auto/modelview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_modelview Test:
 #####################################################################
 
-add_qt_test(tst_modelview
+qt_add_test(tst_modelview
     SOURCES
         modeltest.cpp modeltest.h
         tst_modelview.cpp
@@ -16,12 +16,12 @@ add_qt_test(tst_modelview
 ## Scopes:
 #####################################################################
 
-extend_target(tst_modelview CONDITION boot2qt
+qt_extend_target(tst_modelview CONDITION boot2qt
     DEFINES
         SLOW_MODELTEST
 )
 
-extend_target(tst_modelview CONDITION mingw
+qt_extend_target(tst_modelview CONDITION mingw
     DEFINES
         SLOW_MODELTEST
 )
diff --git a/tests/auto/pods/CMakeLists.txt b/tests/auto/pods/CMakeLists.txt
index b619fa2..9c8fe32 100644
--- a/tests/auto/pods/CMakeLists.txt
+++ b/tests/auto/pods/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_pods Test:
 #####################################################################
 
-add_qt_test(tst_pods
+qt_add_test(tst_pods
     SOURCES
         tst_pods.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/proxy/CMakeLists.txt b/tests/auto/proxy/CMakeLists.txt
index 7988a4b..222f097 100644
--- a/tests/auto/proxy/CMakeLists.txt
+++ b/tests/auto/proxy/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_proxy Test:
 #####################################################################
 
-add_qt_test(tst_proxy
+qt_add_test(tst_proxy
     SOURCES
         tst_proxy.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/proxy_multiprocess/client/CMakeLists.txt b/tests/auto/proxy_multiprocess/client/CMakeLists.txt
index 3c9b30f..e2f235d 100644
--- a/tests/auto/proxy_multiprocess/client/CMakeLists.txt
+++ b/tests/auto/proxy_multiprocess/client/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## proxy_multiprocess_client Binary:
 #####################################################################
 
-add_qt_executable(proxy_multiprocess_client
+qt_add_executable(proxy_multiprocess_client
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../namespace.h
diff --git a/tests/auto/proxy_multiprocess/proxy/CMakeLists.txt b/tests/auto/proxy_multiprocess/proxy/CMakeLists.txt
index 7645aab..2b0a514 100644
--- a/tests/auto/proxy_multiprocess/proxy/CMakeLists.txt
+++ b/tests/auto/proxy_multiprocess/proxy/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## proxy Binary:
 #####################################################################
 
-add_qt_executable(proxy
+qt_add_executable(proxy
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/proxy_multiprocess/server/CMakeLists.txt b/tests/auto/proxy_multiprocess/server/CMakeLists.txt
index 8f9426b..6ddc010 100644
--- a/tests/auto/proxy_multiprocess/server/CMakeLists.txt
+++ b/tests/auto/proxy_multiprocess/server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## proxy_multiprocess_server Binary:
 #####################################################################
 
-add_qt_executable(proxy_multiprocess_server
+qt_add_executable(proxy_multiprocess_server
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ${CMAKE_CURRENT_BINARY_DIR}/rep_subclass_source.h
diff --git a/tests/auto/proxy_multiprocess/tst/CMakeLists.txt b/tests/auto/proxy_multiprocess/tst/CMakeLists.txt
index cbda164..d3dcdfb 100644
--- a/tests/auto/proxy_multiprocess/tst/CMakeLists.txt
+++ b/tests/auto/proxy_multiprocess/tst/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_proxy_multiprocess Test:
 #####################################################################
 
-add_qt_test(tst_proxy_multiprocess
+qt_add_test(tst_proxy_multiprocess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         tst_proxy_multiprocess.cpp
diff --git a/tests/auto/qml/integration/CMakeLists.txt b/tests/auto/qml/integration/CMakeLists.txt
index d596e51..b5d15ec 100644
--- a/tests/auto/qml/integration/CMakeLists.txt
+++ b/tests/auto/qml/integration/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(tst_qmlintegration
+qt_add_test(tst_qmlintegration
     GUI
     QMLTEST
     SOURCES
diff --git a/tests/auto/qml/usertypes/CMakeLists.txt b/tests/auto/qml/usertypes/CMakeLists.txt
index d38d07e..3345deb 100644
--- a/tests/auto/qml/usertypes/CMakeLists.txt
+++ b/tests/auto/qml/usertypes/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_usertypes Test:
 #####################################################################
 
-add_qt_test(tst_usertypes
+qt_add_test(tst_usertypes
     SOURCES
         tst_usertypes.cpp
     DEFINES
diff --git a/tests/auto/repc/enums/CMakeLists.txt b/tests/auto/repc/enums/CMakeLists.txt
index 9840534..decd889 100644
--- a/tests/auto/repc/enums/CMakeLists.txt
+++ b/tests/auto/repc/enums/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_enums Test:
 #####################################################################
 
-add_qt_test(tst_enums
+qt_add_test(tst_enums
     SOURCES
         tst_enums.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/repc/pods/.prev_CMakeLists.txt b/tests/auto/repc/pods/.prev_CMakeLists.txt
index ef4a5d2..8965c6f 100644
--- a/tests/auto/repc/pods/.prev_CMakeLists.txt
+++ b/tests/auto/repc/pods/.prev_CMakeLists.txt
@@ -1,24 +1,18 @@
 # Generated from pods.pro.
 
 #####################################################################
-## tst_pods Test:
+## tst_repc_pods Test:
 #####################################################################
 
-add_qt_test(tst_pods
+qt_add_test(tst_repc_pods
     SOURCES
         tst_pods.cpp
     PUBLIC_LIBRARIES
         Qt::RemoteObjects
 )
-qt6_add_repc_replica(tst_pods
+qt6_add_repc_replica(tst_repc_pods
     pods.rep
 )
 
-#### Keys ignored in scope 1:.:.:pods.pro:<TRUE>:
-# QTRO_SOURCE_TREE = "${CMAKE_SOURCE_DIR}"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:pods.pro:QT_CONFIG___contains___c++11:
-# QTRO_SOURCE_TREE = "${CMAKE_SOURCE_DIR}"
diff --git a/tests/auto/repc/pods/CMakeLists.txt b/tests/auto/repc/pods/CMakeLists.txt
index ea18fc6..8965c6f 100644
--- a/tests/auto/repc/pods/CMakeLists.txt
+++ b/tests/auto/repc/pods/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_repc_pods Test:
 #####################################################################
 
-add_qt_test(tst_repc_pods
+qt_add_test(tst_repc_pods
     SOURCES
         tst_pods.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/repc/signature/differentClassEnum/CMakeLists.txt b/tests/auto/repc/signature/differentClassEnum/CMakeLists.txt
index 9c48ba0..58904f4 100644
--- a/tests/auto/repc/signature/differentClassEnum/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentClassEnum/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentClassEnum Binary:
 #####################################################################
 
-add_qt_executable(differentClassEnum
+qt_add_executable(differentClassEnum
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentGlobalEnum/CMakeLists.txt b/tests/auto/repc/signature/differentGlobalEnum/CMakeLists.txt
index c3015aa..e1c05df 100644
--- a/tests/auto/repc/signature/differentGlobalEnum/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentGlobalEnum/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentGlobalEnum Binary:
 #####################################################################
 
-add_qt_executable(differentGlobalEnum
+qt_add_executable(differentGlobalEnum
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentPropertyCount/CMakeLists.txt b/tests/auto/repc/signature/differentPropertyCount/CMakeLists.txt
index f9857f5..5808928 100644
--- a/tests/auto/repc/signature/differentPropertyCount/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentPropertyCount/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentPropertyCount Binary:
 #####################################################################
 
-add_qt_executable(differentPropertyCount
+qt_add_executable(differentPropertyCount
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentPropertyType/CMakeLists.txt b/tests/auto/repc/signature/differentPropertyType/CMakeLists.txt
index 1770a41..a289c1a 100644
--- a/tests/auto/repc/signature/differentPropertyType/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentPropertyType/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentPropertyType Binary:
 #####################################################################
 
-add_qt_executable(differentPropertyType
+qt_add_executable(differentPropertyType
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentSignalCount/CMakeLists.txt b/tests/auto/repc/signature/differentSignalCount/CMakeLists.txt
index 204d529..c655189 100644
--- a/tests/auto/repc/signature/differentSignalCount/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentSignalCount/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentSignalCount Binary:
 #####################################################################
 
-add_qt_executable(differentSignalCount
+qt_add_executable(differentSignalCount
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentSignalParamCount/CMakeLists.txt b/tests/auto/repc/signature/differentSignalParamCount/CMakeLists.txt
index e322eb5..035b58e 100644
--- a/tests/auto/repc/signature/differentSignalParamCount/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentSignalParamCount/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentSignalParamCount Binary:
 #####################################################################
 
-add_qt_executable(differentSignalParamCount
+qt_add_executable(differentSignalParamCount
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentSignalParamType/CMakeLists.txt b/tests/auto/repc/signature/differentSignalParamType/CMakeLists.txt
index 3f38352..9f3e84d 100644
--- a/tests/auto/repc/signature/differentSignalParamType/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentSignalParamType/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentSignalParamType Binary:
 #####################################################################
 
-add_qt_executable(differentSignalParamType
+qt_add_executable(differentSignalParamType
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentSlotCount/CMakeLists.txt b/tests/auto/repc/signature/differentSlotCount/CMakeLists.txt
index e5ba9a4..f7e483a 100644
--- a/tests/auto/repc/signature/differentSlotCount/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentSlotCount/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentSlotCount Binary:
 #####################################################################
 
-add_qt_executable(differentSlotCount
+qt_add_executable(differentSlotCount
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentSlotParamCount/CMakeLists.txt b/tests/auto/repc/signature/differentSlotParamCount/CMakeLists.txt
index d22bcb3..6b8d8d7 100644
--- a/tests/auto/repc/signature/differentSlotParamCount/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentSlotParamCount/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentSlotParamCount Binary:
 #####################################################################
 
-add_qt_executable(differentSlotParamCount
+qt_add_executable(differentSlotParamCount
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentSlotParamType/CMakeLists.txt b/tests/auto/repc/signature/differentSlotParamType/CMakeLists.txt
index 541c543..e7be5ce 100644
--- a/tests/auto/repc/signature/differentSlotParamType/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentSlotParamType/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentSlotParamType Binary:
 #####################################################################
 
-add_qt_executable(differentSlotParamType
+qt_add_executable(differentSlotParamType
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/differentSlotType/CMakeLists.txt b/tests/auto/repc/signature/differentSlotType/CMakeLists.txt
index f9a1c86..efc2730 100644
--- a/tests/auto/repc/signature/differentSlotType/CMakeLists.txt
+++ b/tests/auto/repc/signature/differentSlotType/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## differentSlotType Binary:
 #####################################################################
 
-add_qt_executable(differentSlotType
+qt_add_executable(differentSlotType
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/matchAndQuit/CMakeLists.txt b/tests/auto/repc/signature/matchAndQuit/CMakeLists.txt
index fb1f656..65147ac 100644
--- a/tests/auto/repc/signature/matchAndQuit/CMakeLists.txt
+++ b/tests/auto/repc/signature/matchAndQuit/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## matchAndQuit Binary:
 #####################################################################
 
-add_qt_executable(matchAndQuit
+qt_add_executable(matchAndQuit
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/repc/signature/scrambledProperties/CMakeLists.txt b/tests/auto/repc/signature/scrambledProperties/CMakeLists.txt
index b831776..cfc295e 100644
--- a/tests/auto/repc/signature/scrambledProperties/CMakeLists.txt
+++ b/tests/auto/repc/signature/scrambledProperties/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scrambledProperties Binary:
 #####################################################################
 
-add_qt_executable(scrambledProperties
+qt_add_executable(scrambledProperties
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/scrambledSignals/CMakeLists.txt b/tests/auto/repc/signature/scrambledSignals/CMakeLists.txt
index 4101351..60c00bc 100644
--- a/tests/auto/repc/signature/scrambledSignals/CMakeLists.txt
+++ b/tests/auto/repc/signature/scrambledSignals/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scrambledSignals Binary:
 #####################################################################
 
-add_qt_executable(scrambledSignals
+qt_add_executable(scrambledSignals
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/scrambledSlots/CMakeLists.txt b/tests/auto/repc/signature/scrambledSlots/CMakeLists.txt
index 9e19f72..ee1d828 100644
--- a/tests/auto/repc/signature/scrambledSlots/CMakeLists.txt
+++ b/tests/auto/repc/signature/scrambledSlots/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scrambledSlots Binary:
 #####################################################################
 
-add_qt_executable(scrambledSlots
+qt_add_executable(scrambledSlots
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../mismatch.cpp
diff --git a/tests/auto/repc/signature/signatureServer/CMakeLists.txt b/tests/auto/repc/signature/signatureServer/CMakeLists.txt
index 9f44ed6..21af3e1 100644
--- a/tests/auto/repc/signature/signatureServer/CMakeLists.txt
+++ b/tests/auto/repc/signature/signatureServer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## signatureServer Binary:
 #####################################################################
 
-add_qt_executable(signatureServer
+qt_add_executable(signatureServer
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ${CMAKE_CURRENT_BINARY_DIR}/rep_server_source.h
diff --git a/tests/auto/repc/signature/signatureTests/CMakeLists.txt b/tests/auto/repc/signature/signatureTests/CMakeLists.txt
index daf1a6d..5de8420 100644
--- a/tests/auto/repc/signature/signatureTests/CMakeLists.txt
+++ b/tests/auto/repc/signature/signatureTests/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_signature Test:
 #####################################################################
 
-add_qt_test(tst_signature
+qt_add_test(tst_signature
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         tst_signature.cpp
diff --git a/tests/auto/repc/signature/state/CMakeLists.txt b/tests/auto/repc/signature/state/CMakeLists.txt
index d059c37..71409c8 100644
--- a/tests/auto/repc/signature/state/CMakeLists.txt
+++ b/tests/auto/repc/signature/state/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## state Binary:
 #####################################################################
 
-add_qt_executable(state
+qt_add_executable(state
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/repcodegenerator/CMakeLists.txt b/tests/auto/repcodegenerator/CMakeLists.txt
index bd7650e..aa98b47 100644
--- a/tests/auto/repcodegenerator/CMakeLists.txt
+++ b/tests/auto/repcodegenerator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_repcodegenerator Test:
 #####################################################################
 
-add_qt_test(tst_repcodegenerator
+qt_add_test(tst_repcodegenerator
     SOURCES
         tst_repcodegenerator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/repparser/.prev_CMakeLists.txt b/tests/auto/repparser/.prev_CMakeLists.txt
index e07a605..965ecaf 100644
--- a/tests/auto/repparser/.prev_CMakeLists.txt
+++ b/tests/auto/repparser/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_parser Test:
 #####################################################################
 
-add_qt_test(tst_parser
+qt_add_test(tst_parser
     SOURCES
         tst_parser.cpp
     INCLUDE_DIRECTORIES
@@ -23,7 +23,7 @@ qt_process_qlalr(
 ## Scopes:
 #####################################################################
 
-extend_target(tst_parser CONDITION MSVC
+qt_extend_target(tst_parser CONDITION MSVC
     COMPILE_OPTIONS
         /wd4129
 )
diff --git a/tests/auto/repparser/CMakeLists.txt b/tests/auto/repparser/CMakeLists.txt
index c9587d3..de1830f 100644
--- a/tests/auto/repparser/CMakeLists.txt
+++ b/tests/auto/repparser/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_parser Test:
 #####################################################################
 
-add_qt_test(tst_parser
+qt_add_test(tst_parser
     SOURCES
         tst_parser.cpp
     INCLUDE_DIRECTORIES
@@ -23,7 +23,7 @@ qt_process_qlalr(
 ## Scopes:
 #####################################################################
 
-extend_target(tst_parser CONDITION MSVC
+qt_extend_target(tst_parser CONDITION MSVC
     COMPILE_OPTIONS
         /wd4129
 )
diff --git a/tests/auto/restart/client/CMakeLists.txt b/tests/auto/restart/client/CMakeLists.txt
index 7b9d7d7..d9fca22 100644
--- a/tests/auto/restart/client/CMakeLists.txt
+++ b/tests/auto/restart/client/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## restart_client Binary:
 #####################################################################
 
-add_qt_executable(restart_client
+qt_add_executable(restart_client
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/restart/server/CMakeLists.txt b/tests/auto/restart/server/CMakeLists.txt
index be7bd3a..603318f 100644
--- a/tests/auto/restart/server/CMakeLists.txt
+++ b/tests/auto/restart/server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## restart_server Binary:
 #####################################################################
 
-add_qt_executable(restart_server
+qt_add_executable(restart_server
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
diff --git a/tests/auto/restart/tst/CMakeLists.txt b/tests/auto/restart/tst/CMakeLists.txt
index 7a5a41c..33fd223 100644
--- a/tests/auto/restart/tst/CMakeLists.txt
+++ b/tests/auto/restart/tst/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_restart Test:
 #####################################################################
 
-add_qt_test(tst_restart
+qt_add_test(tst_restart
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         tst_restart.cpp
diff --git a/tests/auto/subclassreplica/CMakeLists.txt b/tests/auto/subclassreplica/CMakeLists.txt
index 3a70f74..2129941 100644
--- a/tests/auto/subclassreplica/CMakeLists.txt
+++ b/tests/auto/subclassreplica/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_subclassreplicatest Test:
 #####################################################################
 
-add_qt_test(tst_subclassreplicatest
+qt_add_test(tst_subclassreplicatest
     SOURCES
         tst_subclassreplicatest.cpp
     DEFINES
diff --git a/tools/repc/.prev_CMakeLists.txt b/tools/repc/.prev_CMakeLists.txt
index 11337ec..0a41246 100644
--- a/tools/repc/.prev_CMakeLists.txt
+++ b/tools/repc/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## repc Tool:
 #####################################################################
 
-add_qt_tool(repc
+qt_add_tool(repc
     SOURCES
         cppcodegenerator.cpp cppcodegenerator.h
         main.cpp
@@ -39,13 +39,12 @@ qt_process_qlalr(
 
 #### Keys ignored in scope 1:.:.:repc.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Remote Objects Compiler"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 
 ## Scopes:
 #####################################################################
 
-extend_target(repc CONDITION MSVC
+qt_extend_target(repc CONDITION MSVC
     COMPILE_OPTIONS
         /wd4129
 )
diff --git a/tools/repc/CMakeLists.txt b/tools/repc/CMakeLists.txt
index c42c4e4..bc34e22 100644
--- a/tools/repc/CMakeLists.txt
+++ b/tools/repc/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## repc Tool:
 #####################################################################
 
-add_qt_tool(repc
+qt_add_tool(repc
     TOOLS_TARGET RemoteObjects # special case
     SOURCES
         cppcodegenerator.cpp cppcodegenerator.h
@@ -40,13 +40,12 @@ qt_process_qlalr(
 
 #### Keys ignored in scope 1:.:.:repc.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Remote Objects Compiler"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 
 ## Scopes:
 #####################################################################
 
-extend_target(repc CONDITION MSVC
+qt_extend_target(repc CONDITION MSVC
     COMPILE_OPTIONS
         /wd4129
 )