CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.

Task-number: QTBUG-86815
Change-Id: I2ba7753b64f3d88332e919dc90c98e252e20dd98
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

56 files changed, 96 insertions, 96 deletions

diff --git a/src/client/.prev_CMakeLists.txt b/src/client/.prev_CMakeLists.txt
index 142a8a272..ede73a07c 100644
--- a/src/client/.prev_CMakeLists.txt
+++ b/src/client/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## WaylandClient Module:
 #####################################################################
 
-qt_add_module(WaylandClient
+qt_internal_add_module(WaylandClient
     PLUGIN_TYPES wayland-graphics-integration-client wayland-inputdevice-integration wayland-decoration-client wayland-shell-integration
     SOURCES
         ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h
@@ -89,30 +89,30 @@ qt6_generate_wayland_protocol_client_sources(WaylandClient
 ## Scopes:
 #####################################################################
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
     PUBLIC_LIBRARIES
         XKB::XKB
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
     SOURCES
         qwaylandclipboard.cpp qwaylandclipboard_p.h
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan
     SOURCES
         qwaylandvulkaninstance.cpp qwaylandvulkaninstance_p.h
         qwaylandvulkanwindow.cpp qwaylandvulkanwindow_p.h
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_cursor
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_cursor
     SOURCES
         qwaylandcursor.cpp qwaylandcursor_p.h
     PUBLIC_LIBRARIES
         Wayland::Cursor
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_datadevice
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_datadevice
     SOURCES
         qwaylanddatadevice.cpp qwaylanddatadevice_p.h
         qwaylanddatadevicemanager.cpp qwaylanddatadevicemanager_p.h
@@ -120,12 +120,12 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_datadevice
         qwaylanddatasource.cpp qwaylanddatasource_p.h
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_client_primary_selection
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_client_primary_selection
     SOURCES
         qwaylandprimaryselectionv1.cpp qwaylandprimaryselectionv1_p.h
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_draganddrop
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_draganddrop
     SOURCES
         qwaylanddnd.cpp qwaylanddnd_p.h
 )
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index b72dbb36a..61bf71598 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## WaylandClient Module:
 #####################################################################
 
-qt_add_module(WaylandClient
+qt_internal_add_module(WaylandClient
     PLUGIN_TYPES wayland-graphics-integration-client wayland-inputdevice-integration wayland-decoration-client wayland-shell-integration
     SOURCES
         ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h
@@ -93,31 +93,31 @@ qt6_generate_wayland_protocol_client_sources(WaylandClient
 #
 # Do not explicitly add XKB::XKB. This is already done by Qt::GuiPrivate.
 #
-# qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
+# qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
 #     PUBLIC_LIBRARIES
 #         XKB::XKB
 # )
 # special case end
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
     SOURCES
         qwaylandclipboard.cpp qwaylandclipboard_p.h
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan
     SOURCES
         qwaylandvulkaninstance.cpp qwaylandvulkaninstance_p.h
         qwaylandvulkanwindow.cpp qwaylandvulkanwindow_p.h
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_cursor
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_cursor
     SOURCES
         qwaylandcursor.cpp qwaylandcursor_p.h
     PUBLIC_LIBRARIES
         Wayland::Cursor
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_datadevice
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_datadevice
     SOURCES
         qwaylanddatadevice.cpp qwaylanddatadevice_p.h
         qwaylanddatadevicemanager.cpp qwaylanddatadevicemanager_p.h
@@ -125,12 +125,12 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_datadevice
         qwaylanddatasource.cpp qwaylanddatasource_p.h
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_client_primary_selection
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_client_primary_selection
     SOURCES
         qwaylandprimaryselectionv1.cpp qwaylandprimaryselectionv1_p.h
 )
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_draganddrop
+qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_draganddrop
     SOURCES
         qwaylanddnd.cpp qwaylanddnd_p.h
 )
diff --git a/src/compositor/.prev_CMakeLists.txt b/src/compositor/.prev_CMakeLists.txt
index 1f4776c78..4f3a52008 100644
--- a/src/compositor/.prev_CMakeLists.txt
+++ b/src/compositor/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## WaylandCompositor Module:
 #####################################################################
 
-qt_add_module(WaylandCompositor
+qt_internal_add_module(WaylandCompositor
     PLUGIN_TYPES wayland-graphics-integration-server wayland-hardware-layer-integration
     SOURCES
         ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h
@@ -78,7 +78,7 @@ set(compositor_resource_files
     "shaders/surface_y_xuxv.frag.qsb"
 )
 
-qt_add_resource(WaylandCompositor "compositor"
+qt_internal_add_resource(WaylandCompositor "compositor"
     PREFIX
         "/qt-project.org/wayland/compositor"
     FILES
@@ -118,7 +118,7 @@ if(QT_FEATURE_opengl)
     )
 endif()
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
     SOURCES
         hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h
         hardware_integration/qwlclientbufferintegrationfactory.cpp hardware_integration/qwlclientbufferintegrationfactory_p.h
@@ -134,12 +134,12 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
         Qt::OpenGL
 )
 
-qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
+qt_internal_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
     PUBLIC_LIBRARIES
         Qt::Quick
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
     SOURCES
         compositor_api/qwaylandcompositorquickextensions_p.h
         compositor_api/qwaylandmousetracker.cpp compositor_api/qwaylandmousetracker_p.h
@@ -171,7 +171,7 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
 # QML_IMPORT_NAME = "QtWayland.Compositor"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
     SOURCES
         wayland_wrapper/qwldatadevice.cpp wayland_wrapper/qwldatadevice_p.h
         wayland_wrapper/qwldatadevicemanager.cpp wayland_wrapper/qwldatadevicemanager_p.h
@@ -179,17 +179,17 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
         wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
     PUBLIC_LIBRARIES
         XKB::XKB
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_im
     SOURCES
         compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop
     SOURCES
         compositor_api/qwaylanddrag.cpp compositor_api/qwaylanddrag.h
 )
@@ -202,12 +202,12 @@ if(QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick)
     )
 endif()
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
     SOURCES
         compositor_api/qwaylandquickhardwarelayer.cpp compositor_api/qwaylandquickhardwarelayer_p.h
         extensions/qwltexturesharingextension.cpp extensions/qwltexturesharingextension_p.h
 )
-qt_add_docs(WaylandCompositor
+qt_internal_add_docs(WaylandCompositor
     doc/qtwaylandcompositor.qdocconf
 )
 
diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt
index 2e5f1fc80..11156f56f 100644
--- a/src/compositor/CMakeLists.txt
+++ b/src/compositor/CMakeLists.txt
@@ -11,7 +11,7 @@ if(QT_FEATURE_wayland_compositor_quick)
 endif()
 # special case end
 
-qt_add_module(WaylandCompositor
+qt_internal_add_module(WaylandCompositor
     ${__qt_wayland_compositor_module_args} # special case
     PLUGIN_TYPES wayland-graphics-integration-server wayland-hardware-layer-integration
     SOURCES
@@ -86,7 +86,7 @@ set(compositor_resource_files
     "shaders/surface_y_xuxv.frag.qsb"
 )
 
-qt_add_resource(WaylandCompositor "compositor"
+qt_internal_add_resource(WaylandCompositor "compositor"
     PREFIX
         "/qt-project.org/wayland/compositor"
     FILES
@@ -126,7 +126,7 @@ if(QT_FEATURE_opengl)
     )
 endif()
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
     SOURCES
         hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h
         hardware_integration/qwlclientbufferintegrationfactory.cpp hardware_integration/qwlclientbufferintegrationfactory_p.h
@@ -142,12 +142,12 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
         Qt::OpenGL
 )
 
-qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
+qt_internal_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
     PUBLIC_LIBRARIES
         Qt::Quick
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
     SOURCES
         compositor_api/qwaylandcompositorquickextensions_p.h
         compositor_api/qwaylandmousetracker.cpp compositor_api/qwaylandmousetracker_p.h
@@ -179,7 +179,7 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick
 # QML_IMPORT_NAME = "QtWayland.Compositor"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
     SOURCES
         wayland_wrapper/qwldatadevice.cpp wayland_wrapper/qwldatadevice_p.h
         wayland_wrapper/qwldatadevicemanager.cpp wayland_wrapper/qwldatadevicemanager_p.h
@@ -191,18 +191,18 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
 #
 # Do not explicitly add XKB::XKB. This is already done by Qt::GuiPrivate.
 #
-#qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
+#qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
 #    PUBLIC_LIBRARIES
 #        XKB::XKB
 #)
 # special case end
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_im
     SOURCES
         compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop
     SOURCES
         compositor_api/qwaylanddrag.cpp compositor_api/qwaylanddrag.h
 )
@@ -215,12 +215,12 @@ if(QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick)
     )
 endif()
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
+qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick
     SOURCES
         compositor_api/qwaylandquickhardwarelayer.cpp compositor_api/qwaylandquickhardwarelayer_p.h
         extensions/qwltexturesharingextension.cpp extensions/qwltexturesharingextension_p.h
 )
-qt_add_docs(WaylandCompositor
+qt_internal_add_docs(WaylandCompositor
     doc/qtwaylandcompositor.qdocconf
 )
 
diff --git a/src/imports/compositor-extensions/iviapplication/CMakeLists.txt b/src/imports/compositor-extensions/iviapplication/CMakeLists.txt
index 9b132f30b..e01e4c379 100644
--- a/src/imports/compositor-extensions/iviapplication/CMakeLists.txt
+++ b/src/imports/compositor-extensions/iviapplication/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwaylandcompositoriviapplicationplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qwaylandcompositoriviapplicationplugin
+qt_internal_add_qml_module(qwaylandcompositoriviapplicationplugin
     URI "QtWayland.Compositor.IviApplication"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QWaylandCompositorIviApplicationPlugin
diff --git a/src/imports/compositor-extensions/wlshell/CMakeLists.txt b/src/imports/compositor-extensions/wlshell/CMakeLists.txt
index 51fd0023d..a88abe1f2 100644
--- a/src/imports/compositor-extensions/wlshell/CMakeLists.txt
+++ b/src/imports/compositor-extensions/wlshell/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwaylandcompositorwlshellplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qwaylandcompositorwlshellplugin
+qt_internal_add_qml_module(qwaylandcompositorwlshellplugin
     URI "QtWayland.Compositor.WlShell"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QWaylandCompositorWlShellPlugin
diff --git a/src/imports/compositor-extensions/xdgshell/CMakeLists.txt b/src/imports/compositor-extensions/xdgshell/CMakeLists.txt
index 6928b8374..00210ab21 100644
--- a/src/imports/compositor-extensions/xdgshell/CMakeLists.txt
+++ b/src/imports/compositor-extensions/xdgshell/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwaylandcompositorxdgshellplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qwaylandcompositorxdgshellplugin
+qt_internal_add_qml_module(qwaylandcompositorxdgshellplugin
     URI "QtWayland.Compositor.XdgShell"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QWaylandCompositorXdgShellPlugin
diff --git a/src/imports/compositor/CMakeLists.txt b/src/imports/compositor/CMakeLists.txt
index fb7a48572..93545f387 100644
--- a/src/imports/compositor/CMakeLists.txt
+++ b/src/imports/compositor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwaylandcompositorplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qwaylandcompositorplugin
+qt_internal_add_qml_module(qwaylandcompositorplugin
     URI "QtWayland.Compositor"
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QWaylandCompositorPlugin
diff --git a/src/imports/texture-sharing-extension/CMakeLists.txt b/src/imports/texture-sharing-extension/CMakeLists.txt
index 761c3a24e..cb8aa75ba 100644
--- a/src/imports/texture-sharing-extension/CMakeLists.txt
+++ b/src/imports/texture-sharing-extension/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwaylandtexturesharingextension Plugin:
 #####################################################################
 
-qt_add_qml_module(qwaylandtexturesharingextension
+qt_internal_add_qml_module(qwaylandtexturesharingextension
     URI "QtWayland.Compositor.TextureSharingExtension"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QWaylandTextureSharingExtensionPlugin
diff --git a/src/imports/texture-sharing/CMakeLists.txt b/src/imports/texture-sharing/CMakeLists.txt
index baf118d24..e240635ff 100644
--- a/src/imports/texture-sharing/CMakeLists.txt
+++ b/src/imports/texture-sharing/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qwaylandtexturesharing Plugin:
 #####################################################################
 
-qt_add_qml_module(qwaylandtexturesharing
+qt_internal_add_qml_module(qwaylandtexturesharing
     URI "QtWayland.Client.TextureSharing"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QWaylandTextureSharingPlugin
diff --git a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt
index 9cc9e10df..29316195c 100644
--- a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt
@@ -31,7 +31,7 @@ qt6_generate_wayland_protocol_client_sources(QWaylandIviShellIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QWaylandIviShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(QWaylandIviShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
     PUBLIC_LIBRARIES
         XKB::XKB
 )
diff --git a/src/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/shellintegration/wl-shell/CMakeLists.txt
index 3e630c7c8..56cc5b853 100644
--- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/wl-shell/CMakeLists.txt
@@ -30,7 +30,7 @@ qt6_generate_wayland_protocol_client_sources(QWaylandWlShellIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QWaylandWlShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(QWaylandWlShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
     LIBRARIES
         XKB::XKB
 )
diff --git a/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt
index 231bac087..25bd0ca72 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt
+++ b/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt
@@ -32,7 +32,7 @@ qt_internal_add_plugin(QWaylandXdgShellV5IntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QWaylandXdgShellV5IntegrationPlugin CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(QWaylandXdgShellV5IntegrationPlugin CONDITION QT_FEATURE_xkbcommon
     PUBLIC_LIBRARIES
         XKB::XKB
 )
diff --git a/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt
index 190c6698f..4ea237f6a 100644
--- a/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt
+++ b/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt
@@ -30,7 +30,7 @@ qt6_generate_wayland_protocol_client_sources(QWaylandXdgShellV6IntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QWaylandXdgShellV6IntegrationPlugin CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(QWaylandXdgShellV6IntegrationPlugin CONDITION QT_FEATURE_xkbcommon
     LIBRARIES
         XKB::XKB
 )
diff --git a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt
index 1b55b8eb7..88a78df7f 100644
--- a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt
@@ -32,7 +32,7 @@ qt6_generate_wayland_protocol_client_sources(QWaylandXdgShellIntegrationPlugin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QWaylandXdgShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(QWaylandXdgShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
     LIBRARIES
         XKB::XKB
 )
diff --git a/src/qtwaylandscanner/.prev_CMakeLists.txt b/src/qtwaylandscanner/.prev_CMakeLists.txt
index baa16eaeb..c4c3c5a8a 100644
--- a/src/qtwaylandscanner/.prev_CMakeLists.txt
+++ b/src/qtwaylandscanner/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qtwaylandscanner)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     SOURCES
         qtwaylandscanner.cpp
     PUBLIC_LIBRARIES
diff --git a/src/qtwaylandscanner/CMakeLists.txt b/src/qtwaylandscanner/CMakeLists.txt
index 74acf3419..0d16bc858 100644
--- a/src/qtwaylandscanner/CMakeLists.txt
+++ b/src/qtwaylandscanner/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_get_tool_target_name(target_name qtwaylandscanner)
-qt_add_tool(${target_name}
+qt_internal_add_tool(${target_name}
     TOOLS_TARGET WaylandScanner # special case
     SOURCES
         qtwaylandscanner.cpp
diff --git a/tests/auto/client/client/.prev_CMakeLists.txt b/tests/auto/client/client/.prev_CMakeLists.txt
index c52ab320b..ece394fcc 100644
--- a/tests/auto/client/client/.prev_CMakeLists.txt
+++ b/tests/auto/client/client/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_client Test:
 #####################################################################
 
-qt_add_test(tst_client
+qt_internal_add_test(tst_client
     SOURCES
         ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h
         ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h
diff --git a/tests/auto/client/client/CMakeLists.txt b/tests/auto/client/client/CMakeLists.txt
index f7e317c77..919bf064d 100644
--- a/tests/auto/client/client/CMakeLists.txt
+++ b/tests/auto/client/client/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_client Test:
 #####################################################################
 
-qt_add_test(tst_client
+qt_internal_add_test(tst_client
     SOURCES
         ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h
         ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h
diff --git a/tests/auto/client/datadevicev1/.prev_CMakeLists.txt b/tests/auto/client/datadevicev1/.prev_CMakeLists.txt
index e835f09d9..6a1060b38 100644
--- a/tests/auto/client/datadevicev1/.prev_CMakeLists.txt
+++ b/tests/auto/client/datadevicev1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_datadevicev1 Test:
 #####################################################################
 
-qt_add_test(tst_datadevicev1
+qt_internal_add_test(tst_datadevicev1
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/datadevicev1/CMakeLists.txt b/tests/auto/client/datadevicev1/CMakeLists.txt
index 06a56ccfd..b2da63977 100644
--- a/tests/auto/client/datadevicev1/CMakeLists.txt
+++ b/tests/auto/client/datadevicev1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_datadevicev1 Test:
 #####################################################################
 
-qt_add_test(tst_datadevicev1
+qt_internal_add_test(tst_datadevicev1
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt b/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt
index c9e5eae13..7cf9624c0 100644
--- a/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt
+++ b/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_client_fullscreenshellv1 Test:
 #####################################################################
 
-qt_add_test(tst_client_fullscreenshellv1
+qt_internal_add_test(tst_client_fullscreenshellv1
     SOURCES
         ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h
         ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h
diff --git a/tests/auto/client/fullscreenshellv1/CMakeLists.txt b/tests/auto/client/fullscreenshellv1/CMakeLists.txt
index 73d92ead8..7a5a72c24 100644
--- a/tests/auto/client/fullscreenshellv1/CMakeLists.txt
+++ b/tests/auto/client/fullscreenshellv1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_client_fullscreenshellv1 Test:
 #####################################################################
 
-qt_add_test(tst_client_fullscreenshellv1
+qt_internal_add_test(tst_client_fullscreenshellv1
     SOURCES
         ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h
         ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h
diff --git a/tests/auto/client/inputcontext/.prev_CMakeLists.txt b/tests/auto/client/inputcontext/.prev_CMakeLists.txt
index c32f2e930..2d2783926 100644
--- a/tests/auto/client/inputcontext/.prev_CMakeLists.txt
+++ b/tests/auto/client/inputcontext/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_inputcontext Test:
 #####################################################################
 
-qt_add_test(tst_inputcontext
+qt_internal_add_test(tst_inputcontext
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/inputcontext/CMakeLists.txt b/tests/auto/client/inputcontext/CMakeLists.txt
index 5eb73b11c..1423c790c 100644
--- a/tests/auto/client/inputcontext/CMakeLists.txt
+++ b/tests/auto/client/inputcontext/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_inputcontext Test:
 #####################################################################
 
-qt_add_test(tst_inputcontext
+qt_internal_add_test(tst_inputcontext
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/iviapplication/.prev_CMakeLists.txt b/tests/auto/client/iviapplication/.prev_CMakeLists.txt
index 0453aad81..2aaed6bab 100644
--- a/tests/auto/client/iviapplication/.prev_CMakeLists.txt
+++ b/tests/auto/client/iviapplication/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_client_iviapplication Test:
 #####################################################################
 
-qt_add_test(tst_client_iviapplication
+qt_internal_add_test(tst_client_iviapplication
     SOURCES
         ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h
         ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h
diff --git a/tests/auto/client/iviapplication/CMakeLists.txt b/tests/auto/client/iviapplication/CMakeLists.txt
index 7e3bfd73a..cf6ebeab5 100644
--- a/tests/auto/client/iviapplication/CMakeLists.txt
+++ b/tests/auto/client/iviapplication/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_client_iviapplication Test:
 #####################################################################
 
-qt_add_test(tst_client_iviapplication
+qt_internal_add_test(tst_client_iviapplication
     SOURCES
         ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h
         ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h
diff --git a/tests/auto/client/nooutput/.prev_CMakeLists.txt b/tests/auto/client/nooutput/.prev_CMakeLists.txt
index 61b43b0f6..18479bdfc 100644
--- a/tests/auto/client/nooutput/.prev_CMakeLists.txt
+++ b/tests/auto/client/nooutput/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_nooutput Test:
 #####################################################################
 
-qt_add_test(tst_nooutput
+qt_internal_add_test(tst_nooutput
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/nooutput/CMakeLists.txt b/tests/auto/client/nooutput/CMakeLists.txt
index f7e9dfec1..b353d3246 100644
--- a/tests/auto/client/nooutput/CMakeLists.txt
+++ b/tests/auto/client/nooutput/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_nooutput Test:
 #####################################################################
 
-qt_add_test(tst_nooutput
+qt_internal_add_test(tst_nooutput
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/output/.prev_CMakeLists.txt b/tests/auto/client/output/.prev_CMakeLists.txt
index 7e8e882c5..4103d7a8b 100644
--- a/tests/auto/client/output/.prev_CMakeLists.txt
+++ b/tests/auto/client/output/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_output Test:
 #####################################################################
 
-qt_add_test(tst_output
+qt_internal_add_test(tst_output
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/output/CMakeLists.txt b/tests/auto/client/output/CMakeLists.txt
index e4267fadb..acb1d53eb 100644
--- a/tests/auto/client/output/CMakeLists.txt
+++ b/tests/auto/client/output/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_output Test:
 #####################################################################
 
-qt_add_test(tst_output
+qt_internal_add_test(tst_output
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt b/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt
index 3d23b446a..9c207adc1 100644
--- a/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt
+++ b/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_primaryselectionv1 Test:
 #####################################################################
 
-qt_add_test(tst_primaryselectionv1
+qt_internal_add_test(tst_primaryselectionv1
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/primaryselectionv1/CMakeLists.txt b/tests/auto/client/primaryselectionv1/CMakeLists.txt
index a8f9ae131..f3e592cac 100644
--- a/tests/auto/client/primaryselectionv1/CMakeLists.txt
+++ b/tests/auto/client/primaryselectionv1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_primaryselectionv1 Test:
 #####################################################################
 
-qt_add_test(tst_primaryselectionv1
+qt_internal_add_test(tst_primaryselectionv1
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/seatv4/.prev_CMakeLists.txt b/tests/auto/client/seatv4/.prev_CMakeLists.txt
index d37de1da8..16eed042e 100644
--- a/tests/auto/client/seatv4/.prev_CMakeLists.txt
+++ b/tests/auto/client/seatv4/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_seatv4 Test:
 #####################################################################
 
-qt_add_test(tst_seatv4
+qt_internal_add_test(tst_seatv4
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
@@ -34,7 +34,7 @@ qt6_generate_wayland_protocol_server_sources(tst_seatv4
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor
+qt_internal_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor
     PUBLIC_LIBRARIES
         Qt::GuiPrivate
         Wayland::Cursor
diff --git a/tests/auto/client/seatv4/CMakeLists.txt b/tests/auto/client/seatv4/CMakeLists.txt
index 5496bd59f..f4eb28b84 100644
--- a/tests/auto/client/seatv4/CMakeLists.txt
+++ b/tests/auto/client/seatv4/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_seatv4 Test:
 #####################################################################
 
-qt_add_test(tst_seatv4
+qt_internal_add_test(tst_seatv4
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
@@ -35,7 +35,7 @@ qt6_generate_wayland_protocol_server_sources(tst_seatv4
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor
+qt_internal_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor
     PUBLIC_LIBRARIES
         Qt::GuiPrivate
         Wayland::Cursor
diff --git a/tests/auto/client/seatv5/.prev_CMakeLists.txt b/tests/auto/client/seatv5/.prev_CMakeLists.txt
index fa9e5a4eb..f30c0c766 100644
--- a/tests/auto/client/seatv5/.prev_CMakeLists.txt
+++ b/tests/auto/client/seatv5/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_seatv5 Test:
 #####################################################################
 
-qt_add_test(tst_seatv5
+qt_internal_add_test(tst_seatv5
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/seatv5/CMakeLists.txt b/tests/auto/client/seatv5/CMakeLists.txt
index 67bfc6535..7545d769e 100644
--- a/tests/auto/client/seatv5/CMakeLists.txt
+++ b/tests/auto/client/seatv5/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_seatv5 Test:
 #####################################################################
 
-qt_add_test(tst_seatv5
+qt_internal_add_test(tst_seatv5
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/surface/.prev_CMakeLists.txt b/tests/auto/client/surface/.prev_CMakeLists.txt
index a8eb58dac..ed900c8d1 100644
--- a/tests/auto/client/surface/.prev_CMakeLists.txt
+++ b/tests/auto/client/surface/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_surface Test:
 #####################################################################
 
-qt_add_test(tst_surface
+qt_internal_add_test(tst_surface
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/surface/CMakeLists.txt b/tests/auto/client/surface/CMakeLists.txt
index a3962ddaf..0674f7de7 100644
--- a/tests/auto/client/surface/CMakeLists.txt
+++ b/tests/auto/client/surface/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_surface Test:
 #####################################################################
 
-qt_add_test(tst_surface
+qt_internal_add_test(tst_surface
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/tabletv2/.prev_CMakeLists.txt b/tests/auto/client/tabletv2/.prev_CMakeLists.txt
index 5fecee50a..96b32d24b 100644
--- a/tests/auto/client/tabletv2/.prev_CMakeLists.txt
+++ b/tests/auto/client/tabletv2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_tabletv2 Test:
 #####################################################################
 
-qt_add_test(tst_tabletv2
+qt_internal_add_test(tst_tabletv2
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/tabletv2/CMakeLists.txt b/tests/auto/client/tabletv2/CMakeLists.txt
index d039e30dd..6d7507260 100644
--- a/tests/auto/client/tabletv2/CMakeLists.txt
+++ b/tests/auto/client/tabletv2/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_tabletv2 Test:
 #####################################################################
 
-qt_add_test(tst_tabletv2
+qt_internal_add_test(tst_tabletv2
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/wl_connect/CMakeLists.txt b/tests/auto/client/wl_connect/CMakeLists.txt
index 5a01bedd0..0c7140ac6 100644
--- a/tests/auto/client/wl_connect/CMakeLists.txt
+++ b/tests/auto/client/wl_connect/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_wlconnect Test:
 #####################################################################
 
-qt_add_test(tst_wlconnect
+qt_internal_add_test(tst_wlconnect
     SOURCES
         tst_wlconnect.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt b/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt
index 228ad83e0..31588782e 100644
--- a/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt
+++ b/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_xdgdecorationv1 Test:
 #####################################################################
 
-qt_add_test(tst_xdgdecorationv1
+qt_internal_add_test(tst_xdgdecorationv1
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/xdgdecorationv1/CMakeLists.txt b/tests/auto/client/xdgdecorationv1/CMakeLists.txt
index fb0fd06ad..8959be982 100644
--- a/tests/auto/client/xdgdecorationv1/CMakeLists.txt
+++ b/tests/auto/client/xdgdecorationv1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_xdgdecorationv1 Test:
 #####################################################################
 
-qt_add_test(tst_xdgdecorationv1
+qt_internal_add_test(tst_xdgdecorationv1
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/xdgoutput/.prev_CMakeLists.txt b/tests/auto/client/xdgoutput/.prev_CMakeLists.txt
index 3fc5aa772..33357ffdc 100644
--- a/tests/auto/client/xdgoutput/.prev_CMakeLists.txt
+++ b/tests/auto/client/xdgoutput/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_xdgoutput Test:
 #####################################################################
 
-qt_add_test(tst_xdgoutput
+qt_internal_add_test(tst_xdgoutput
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/xdgoutput/CMakeLists.txt b/tests/auto/client/xdgoutput/CMakeLists.txt
index 341624e4a..37dee4e46 100644
--- a/tests/auto/client/xdgoutput/CMakeLists.txt
+++ b/tests/auto/client/xdgoutput/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_xdgoutput Test:
 #####################################################################
 
-qt_add_test(tst_xdgoutput
+qt_internal_add_test(tst_xdgoutput
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/xdgshell/.prev_CMakeLists.txt b/tests/auto/client/xdgshell/.prev_CMakeLists.txt
index 4faa14f3d..a3872d726 100644
--- a/tests/auto/client/xdgshell/.prev_CMakeLists.txt
+++ b/tests/auto/client/xdgshell/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_xdgshell Test:
 #####################################################################
 
-qt_add_test(tst_xdgshell
+qt_internal_add_test(tst_xdgshell
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/xdgshell/CMakeLists.txt b/tests/auto/client/xdgshell/CMakeLists.txt
index a680575ca..3b5cdfe83 100644
--- a/tests/auto/client/xdgshell/CMakeLists.txt
+++ b/tests/auto/client/xdgshell/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_xdgshell Test:
 #####################################################################
 
-qt_add_test(tst_xdgshell
+qt_internal_add_test(tst_xdgshell
     SOURCES
         ../shared/corecompositor.cpp ../shared/corecompositor.h
         ../shared/coreprotocol.cpp ../shared/coreprotocol.h
diff --git a/tests/auto/client/xdgshellv6/.prev_CMakeLists.txt b/tests/auto/client/xdgshellv6/.prev_CMakeLists.txt
index 8fb87235b..12f3ee190 100644
--- a/tests/auto/client/xdgshellv6/.prev_CMakeLists.txt
+++ b/tests/auto/client/xdgshellv6/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_client_xdgshellv6 Test:
 #####################################################################
 
-qt_add_test(tst_client_xdgshellv6
+qt_internal_add_test(tst_client_xdgshellv6
     SOURCES
         ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h
         ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h
diff --git a/tests/auto/client/xdgshellv6/CMakeLists.txt b/tests/auto/client/xdgshellv6/CMakeLists.txt
index 03acb4815..cc8b154b4 100644
--- a/tests/auto/client/xdgshellv6/CMakeLists.txt
+++ b/tests/auto/client/xdgshellv6/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_client_xdgshellv6 Test:
 #####################################################################
 
-qt_add_test(tst_client_xdgshellv6
+qt_internal_add_test(tst_client_xdgshellv6
     SOURCES
         ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h
         ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h
diff --git a/tests/auto/compositor/compositor/CMakeLists.txt b/tests/auto/compositor/compositor/CMakeLists.txt
index 7e27448f2..4dce9b0f9 100644
--- a/tests/auto/compositor/compositor/CMakeLists.txt
+++ b/tests/auto/compositor/compositor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_compositor Test:
 #####################################################################
 
-qt_add_test(tst_compositor
+qt_internal_add_test(tst_compositor
     SOURCES
         mockclient.cpp mockclient.h
         mockkeyboard.cpp mockkeyboard.h
@@ -38,7 +38,7 @@ qt6_generate_wayland_protocol_client_sources(tst_compositor
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_compositor CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(tst_compositor CONDITION QT_FEATURE_xkbcommon
     PUBLIC_LIBRARIES
         XKB::XKB
 )
diff --git a/tests/manual/qmlclient/CMakeLists.txt b/tests/manual/qmlclient/CMakeLists.txt
index 5443fcbc1..b91ee4a2c 100644
--- a/tests/manual/qmlclient/CMakeLists.txt
+++ b/tests/manual/qmlclient/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlclient Binary:
 #####################################################################
 
-qt_add_manual_test(qmlclient
+qt_internal_add_manual_test(qmlclient
     GUI
     SOURCES
         main.cpp
@@ -21,7 +21,7 @@ set(qml_resource_files
     "main.qml"
 )
 
-qt_add_resource(qmlclient "qml"
+qt_internal_add_resource(qmlclient "qml"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/scaling-compositor/CMakeLists.txt b/tests/manual/scaling-compositor/CMakeLists.txt
index af6e5bd6d..c64b507fc 100644
--- a/tests/manual/scaling-compositor/CMakeLists.txt
+++ b/tests/manual/scaling-compositor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## scaling-compositor Binary:
 #####################################################################
 
-qt_add_manual_test(scaling-compositor
+qt_internal_add_manual_test(scaling-compositor
     GUI
     SOURCES
         main.cpp
@@ -18,7 +18,7 @@ set(qml_resource_files
     "main.qml"
 )
 
-qt_add_resource(scaling-compositor "qml"
+qt_internal_add_resource(scaling-compositor "qml"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/subsurface/CMakeLists.txt b/tests/manual/subsurface/CMakeLists.txt
index fd450f203..9d8eda99d 100644
--- a/tests/manual/subsurface/CMakeLists.txt
+++ b/tests/manual/subsurface/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## subsurface Binary:
 #####################################################################
 
-qt_add_manual_test(subsurface
+qt_internal_add_manual_test(subsurface
     GUI
     SOURCES
         main.cpp
@@ -23,7 +23,7 @@ set(qml_resource_files
     "main.qml"
 )
 
-qt_add_resource(subsurface "qml"
+qt_internal_add_resource(subsurface "qml"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/texture-sharing/cpp-client/CMakeLists.txt b/tests/manual/texture-sharing/cpp-client/CMakeLists.txt
index 03819d3a3..f924dca97 100644
--- a/tests/manual/texture-sharing/cpp-client/CMakeLists.txt
+++ b/tests/manual/texture-sharing/cpp-client/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cpp-client Binary:
 #####################################################################
 
-qt_add_manual_test(cpp-client
+qt_internal_add_manual_test(cpp-client
     GUI
     SOURCES
         ../../../../src/imports/texture-sharing/texturesharingextension.cpp ../../../../src/imports/texture-sharing/texturesharingextension.h
diff --git a/tests/manual/wip-cpp-compositor/CMakeLists.txt b/tests/manual/wip-cpp-compositor/CMakeLists.txt
index eaef05d7c..4bae44d2d 100644
--- a/tests/manual/wip-cpp-compositor/CMakeLists.txt
+++ b/tests/manual/wip-cpp-compositor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## wip-cpp-compositor Binary:
 #####################################################################
 
-qt_add_manual_test(wip-cpp-compositor
+qt_internal_add_manual_test(wip-cpp-compositor
     GUI
     SOURCES
         compositor.cpp compositor.h