Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	tests/auto/client/xdgoutput/tst_xdgoutput.cpp

Regenerated CMake projects.

Removed duplicate wayland source in
tests/auto/client/xdgoutput/xdgoutput.pro. It's still
referenced via the included shared.pri file. Regenerated
the CMake project to adapt to that. Otherwise the CMake
project fails to configure due to duplicate rules with
a error like the one below

CMake Error at src/compositor/Qt6WaylandCompositorMacros.cmake:13 (add_custom_command):
  Attempt to add a custom rule to output
    tests/auto/client/xdgoutput/wayland-xdg-output-unstable-v1-server-protocol.h.rule

Also use a workaround fix for configuring CMake standalone tests
due to regression introduced by
dd7e40b1086020f6a054957f4972720cd684 in qtbase.

Change-Id: Ib364b851a1fa828c153efbf8653c9e4ef5e618cd

9 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
index 038a8843c..f264dfbe9 100644
--- a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QWaylandBrcmEglClientBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QWaylandBrcmEglClientBufferPlugin
+qt_internal_add_plugin(QWaylandBrcmEglClientBufferPlugin
     OUTPUT_NAME brcm-egl
     TYPE wayland-graphics-integration-client
     SOURCES
diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
index f31e868ac..bda31db01 100644
--- a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## DmaBufServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(DmaBufServerBufferPlugin
+qt_internal_add_plugin(DmaBufServerBufferPlugin
     OUTPUT_NAME dmabuf-server
     TYPE wayland-graphics-integration-client
     SOURCES
diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
index ce3f94254..b2eabcf44 100644
--- a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## DrmEglServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(DrmEglServerBufferPlugin
+qt_internal_add_plugin(DrmEglServerBufferPlugin
     OUTPUT_NAME drm-egl-server
     TYPE wayland-graphics-integration-client
     SOURCES
diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt
index 24cc9219e..ed3c4c98f 100644
--- a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## LibHybrisEglServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(LibHybrisEglServerBufferPlugin
+qt_internal_add_plugin(LibHybrisEglServerBufferPlugin
     OUTPUT_NAME libhybris-egl-server
     TYPE wayland-graphics-integration-client
     SOURCES
diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
index aa6e44331..6b68ab8eb 100644
--- a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## ShmServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(ShmServerBufferPlugin
+qt_internal_add_plugin(ShmServerBufferPlugin
     OUTPUT_NAME shm-emulation-server
     TYPE wayland-graphics-integration-client
     SOURCES
diff --git a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
index 64ea378fa..3cfde4680 100644
--- a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## VulkanServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(VulkanServerBufferPlugin
+qt_internal_add_plugin(VulkanServerBufferPlugin
     OUTPUT_NAME vulkan-server
     TYPE wayland-graphics-integration-client
     SOURCES
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
index 2eaf092cc..b7e274170 100644
--- a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QWaylandEglClientBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QWaylandEglClientBufferPlugin
+qt_internal_add_plugin(QWaylandEglClientBufferPlugin
     OUTPUT_NAME qt-plugin-wayland-egl
     TYPE wayland-graphics-integration-client
     SOURCES
diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
index 972cb1ace..6ed42e74f 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QWaylandXCompositeEglClientBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QWaylandXCompositeEglClientBufferPlugin
+qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin
     OUTPUT_NAME xcomposite-egl
     TYPE wayland-graphics-integration-client
     SOURCES
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
index d074fe4ee..54c18d0ed 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QWaylandXCompositeGlxClientBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QWaylandXCompositeGlxClientBufferPlugin
+qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferPlugin
     OUTPUT_NAME xcomposite-glx
     TYPE wayland-graphics-integration-client
     SOURCES