CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.

Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

30 files changed, 39 insertions, 39 deletions

diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
index 0f6d732b09..797c56221b 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_subdirectory(qmyserver)
 
 # special case begin
-qt_add_test(tst_qdbusabstractadaptor
+qt_internal_add_test(tst_qdbusabstractadaptor
     SOURCES
         myobject.h
         tst_qdbusabstractadaptor.cpp
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
index 32af66f30c..e667573738 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmyserver Binary:
 #####################################################################
 
-qt_add_executable(qmyserver
+qt_internal_add_executable(qmyserver
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../myobject.h
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
index d2bdb4434d..0ce4a3e3d3 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmyserver Binary:
 #####################################################################
 
-qt_add_executable(qmyserver
+qt_internal_add_executable(qmyserver
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     NO_INSTALL # special case
     SOURCES
diff --git a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
index ec49268777..4530f60561 100644
--- a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_subdirectory(qpinger)
 
 # special case begin
-qt_add_test(tst_qdbusabstractinterface
+qt_internal_add_test(tst_qdbusabstractinterface
     SOURCES
         interface.cpp
         tst_qdbusabstractinterface.cpp
@@ -12,7 +12,7 @@ qt_add_test(tst_qdbusabstractinterface
         Qt::DBus
 )
 
-qt_extend_target(tst_qdbusabstractinterface
+qt_internal_extend_target(tst_qdbusabstractinterface
     DBUS_INTERFACE_SOURCES
         org.qtproject.QtDBus.Pinger.xml
     DBUS_INTERFACE_BASENAME
diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
index 6db0362e59..c1558770e4 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusabstractinterface Test:
 #####################################################################
 
-qt_add_test(tst_qdbusabstractinterface
+qt_internal_add_test(tst_qdbusabstractinterface
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../interface.cpp ../interface.h
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
index 7f65f85afb..528e0416b8 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpinger Binary:
 #####################################################################
 
-qt_add_executable(qpinger
+qt_internal_add_executable(qpinger
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../interface.cpp ../interface.h
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
index 5ebb914c01..f5658b96a6 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpinger Binary:
 #####################################################################
 
-qt_add_executable(qpinger
+qt_internal_add_executable(qpinger
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     NO_INSTALL # special case
     SOURCES
diff --git a/tests/auto/dbus/qdbusconnection/CMakeLists.txt b/tests/auto/dbus/qdbusconnection/CMakeLists.txt
index e40f18387e..b50d92a64d 100644
--- a/tests/auto/dbus/qdbusconnection/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection Test:
 #####################################################################
 
-qt_add_test(tst_qdbusconnection
+qt_internal_add_test(tst_qdbusconnection
     SOURCES
         tst_qdbusconnection.cpp tst_qdbusconnection.h
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
index 793c7907e5..428b00798a 100644
--- a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_delayed Test:
 #####################################################################
 
-qt_add_test(tst_qdbusconnection_delayed
+qt_internal_add_test(tst_qdbusconnection_delayed
     SOURCES
         tst_qdbusconnection_delayed.cpp
     DEFINES
diff --git a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
index aad766362c..d6b7b20935 100644
--- a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_no_app Test:
 #####################################################################
 
-qt_add_test(tst_qdbusconnection_no_app
+qt_internal_add_test(tst_qdbusconnection_no_app
     SOURCES
         ../qdbusconnection/tst_qdbusconnection.h
         tst_qdbusconnection_no_app.cpp
diff --git a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
index 111f8907c8..02d3f816c8 100644
--- a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_no_bus Test:
 #####################################################################
 
-qt_add_test(tst_qdbusconnection_no_bus
+qt_internal_add_test(tst_qdbusconnection_no_bus
     SOURCES
         tst_qdbusconnection_no_bus.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
index 2a7e1dc80d..a212065da9 100644
--- a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_no_libdbus Test:
 #####################################################################
 
-qt_add_test(tst_qdbusconnection_no_libdbus
+qt_internal_add_test(tst_qdbusconnection_no_libdbus
     SOURCES
         ../qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp
     DEFINES
diff --git a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
index a3b1d8d10c..5b9ef3e4e7 100644
--- a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusconnection_spyhook Test:
 #####################################################################
 
-qt_add_test(tst_qdbusconnection_spyhook
+qt_internal_add_test(tst_qdbusconnection_spyhook
     SOURCES
         ../qdbusconnection/tst_qdbusconnection.h
         tst_qdbusconnection_spyhook.cpp
diff --git a/tests/auto/dbus/qdbuscontext/CMakeLists.txt b/tests/auto/dbus/qdbuscontext/CMakeLists.txt
index ee84e633af..ed1bd137e1 100644
--- a/tests/auto/dbus/qdbuscontext/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuscontext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuscontext Test:
 #####################################################################
 
-qt_add_test(tst_qdbuscontext
+qt_internal_add_test(tst_qdbuscontext
     SOURCES
         tst_qdbuscontext.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt
index 321c61a627..f47d8be56b 100644
--- a/tests/auto/dbus/qdbusinterface/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory(qmyserver)
 ## ../tst_qdbusinterface Test:
 #####################################################################
 
-add_qt_test(tst_qdbusinterface
+qt_internal_add_test(tst_qdbusinterface
     SOURCES
         myobject.h
         tst_qdbusinterface.cpp
@@ -26,14 +26,14 @@ add_qt_test(tst_qdbusinterface
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked
+qt_internal_extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     PUBLIC_LIBRARIES
         dbus-1
 )
 
-extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked
+qt_internal_extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked
     SOURCES
         ../../../../src/dbus/qdbus_symbols.cpp
 )
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
index 9c898fecf6..03b4ac05e1 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmyserver_qdbusinterface Binary:
 #####################################################################
 
-qt_add_executable(qmyserver_qdbusinterface
+qt_internal_add_executable(qmyserver_qdbusinterface
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../myobject.h
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
index 916735bf59..5ee288169d 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmyserver_qdbusinterface Binary:
 #####################################################################
 
-qt_add_executable(qmyserver_qdbusinterface
+qt_internal_add_executable(qmyserver_qdbusinterface
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     NO_INSTALL # special case
     SOURCES
diff --git a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
index 378475dc46..1a70c4af74 100644
--- a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuslocalcalls Test:
 #####################################################################
 
-qt_add_test(tst_qdbuslocalcalls
+qt_internal_add_test(tst_qdbuslocalcalls
     SOURCES
         tst_qdbuslocalcalls.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
index 9130f434b5..2b5d3a5398 100644
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusmarshall Test:
 #####################################################################
 
-qt_add_test(tst_qdbusmarshall
+qt_internal_add_test(tst_qdbusmarshall
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qdbusmarshall.cpp
@@ -16,14 +16,14 @@ qt_add_test(tst_qdbusmarshall
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
+qt_internal_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     PUBLIC_LIBRARIES
         dbus-1
 )
 
-qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
+qt_internal_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
     SOURCES
         ../../../../../src/dbus/qdbus_symbols.cpp
 )
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
index 86ef627276..2019292184 100644
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusmarshall Test:
 #####################################################################
 
-qt_add_test(tst_qdbusmarshall
+qt_internal_add_test(tst_qdbusmarshall
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_qdbusmarshall.cpp
@@ -20,14 +20,14 @@ qt_add_test(tst_qdbusmarshall
 # This test case interacts with dbus code directly via the private
 # headers. The include path is also not exposed via Qt:DBus.
 # special case end
-qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
+qt_internal_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     PUBLIC_LIBRARIES
         dbus-1
 )
 
-qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
+qt_internal_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
     SOURCES
         ../../../../../src/dbus/qdbus_symbols.cpp
 )
diff --git a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
index 28e96caf15..527d464b74 100644
--- a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpong Binary:
 #####################################################################
 
-qt_add_executable(qpong
+qt_internal_add_executable(qpong
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         qpong.cpp
diff --git a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
index 9fe730c533..dec7ce5b27 100644
--- a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusmetaobject Test:
 #####################################################################
 
-qt_add_test(tst_qdbusmetaobject
+qt_internal_add_test(tst_qdbusmetaobject
     SOURCES
         tst_qdbusmetaobject.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
index d4878f681c..cd2295d831 100644
--- a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusmetatype Test:
 #####################################################################
 
-qt_add_test(tst_qdbusmetatype
+qt_internal_add_test(tst_qdbusmetatype
     SOURCES
         tst_qdbusmetatype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
index 47c4261313..0f80718a6e 100644
--- a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuspendingcall Test:
 #####################################################################
 
-qt_add_test(tst_qdbuspendingcall
+qt_internal_add_test(tst_qdbuspendingcall
     SOURCES
         tst_qdbuspendingcall.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
index 2ece3ac4bf..aea3c185e4 100644
--- a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
+++ b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbuspendingreply Test:
 #####################################################################
 
-qt_add_test(tst_qdbuspendingreply
+qt_internal_add_test(tst_qdbuspendingreply
     SOURCES
         tst_qdbuspendingreply.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusreply/CMakeLists.txt b/tests/auto/dbus/qdbusreply/CMakeLists.txt
index 5f75e52d4f..2de7d0cb21 100644
--- a/tests/auto/dbus/qdbusreply/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusreply/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusreply Test:
 #####################################################################
 
-qt_add_test(tst_qdbusreply
+qt_internal_add_test(tst_qdbusreply
     SOURCES
         tst_qdbusreply.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
index d4b16feebd..ed1b9246e6 100644
--- a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusservicewatcher Test:
 #####################################################################
 
-qt_add_test(tst_qdbusservicewatcher
+qt_internal_add_test(tst_qdbusservicewatcher
     SOURCES
         tst_qdbusservicewatcher.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusthreading/CMakeLists.txt b/tests/auto/dbus/qdbusthreading/CMakeLists.txt
index f0a0bebb20..c4f75ab06e 100644
--- a/tests/auto/dbus/qdbusthreading/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusthreading/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusthreading Test:
 #####################################################################
 
-qt_add_test(tst_qdbusthreading
+qt_internal_add_test(tst_qdbusthreading
     SOURCES
         tst_qdbusthreading.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt
index a7d8104ec7..3bf0dea697 100644
--- a/tests/auto/dbus/qdbustype/CMakeLists.txt
+++ b/tests/auto/dbus/qdbustype/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbustype Test:
 #####################################################################
 
-qt_add_test(tst_qdbustype
+qt_internal_add_test(tst_qdbustype
     SOURCES
         tst_qdbustype.cpp
     PUBLIC_LIBRARIES
@@ -15,14 +15,14 @@ qt_add_test(tst_qdbustype
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
+qt_internal_extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
     DEFINES
         QT_LINKED_LIBDBUS
     PUBLIC_LIBRARIES
         dbus-1
 )
 
-qt_extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
+qt_internal_extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
     SOURCES
         ../../../../src/dbus/qdbus_symbols.cpp
 )
diff --git a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
index 7390c25cb4..bbb874dc61 100644
--- a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qdbusxmlparser Test:
 #####################################################################
 
-qt_add_test(tst_qdbusxmlparser
+qt_internal_add_test(tst_qdbusxmlparser
     SOURCES
         tst_qdbusxmlparser.cpp
     PUBLIC_LIBRARIES