CMake: Regenerate and adjust projects after merge

Some of the changes that were needed
- adjusted wayland macros due to changed target names for plugins
- a few direct moc file includes, to get rid of compilation errors
- Threads::Threads linking for a few tests
- a few special cases for QT_FOR_PRIVATE handling because pro2cmake
  doesn't handle those correctly at the moment (they map to
  PRIVATE_MODULE_INTERFACE rather than PRIVATE_LIBRARIES)
- just regenerating all projects

Change-Id: I418ce91b1c69c7388d41eb22b94a93a9e80fa732
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

9 files changed, 53 insertions, 70 deletions

diff --git a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
index e02b020e6..038a8843c 100644
--- a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from brcm-egl.pro.
 
 #####################################################################
-## brcm-egl Plugin:
+## QWaylandBrcmEglClientBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(brcm-egl
+qt_add_plugin(QWaylandBrcmEglClientBufferPlugin
+    OUTPUT_NAME brcm-egl
     TYPE wayland-graphics-integration-client
-    CLASS_NAME QWaylandBrcmEglClientBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
         ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
@@ -14,20 +14,17 @@ qt_add_plugin(brcm-egl
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/brcm-egl
-    LIBRARIES
-        Qt::EglSupportPrivate
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
         EGL::EGL
         Qt::Core
-        Qt::EglSupport
+        Qt::EglSupportPrivate
         Qt::Gui
-        Qt::WaylandClient
+        Qt::WaylandClientPrivate
         Wayland::Client
 )
 
-qt6_generate_wayland_protocol_client_sources(brcm-egl
+qt6_generate_wayland_protocol_client_sources(QWaylandBrcmEglClientBufferPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/brcm-egl/../../../extensions/brcm.xml
 )
diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
index 41d7c12e2..f31e868ac 100644
--- a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
@@ -1,28 +1,27 @@
 # Generated from dmabuf-server.pro.
 
 #####################################################################
-## dmabuf-server Plugin:
+## DmaBufServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(dmabuf-server
+qt_add_plugin(DmaBufServerBufferPlugin
+    OUTPUT_NAME dmabuf-server
     TYPE wayland-graphics-integration-client
-    CLASS_NAME DmaBufServerBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/dmabuf-server
-    LIBRARIES
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         EGL::EGL
         Qt::Core
         Qt::Gui
-        Qt::WaylandClient
+        Qt::OpenGL
+        Qt::WaylandClientPrivate
         Wayland::Client
 )
 
-qt6_generate_wayland_protocol_client_sources(dmabuf-server
+qt6_generate_wayland_protocol_client_sources(DmaBufServerBufferPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/dmabuf-server/../../../extensions/qt-dmabuf-server-buffer.xml
 )
diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
index 337857cc2..ce3f94254 100644
--- a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
@@ -1,28 +1,27 @@
 # Generated from drm-egl-server.pro.
 
 #####################################################################
-## drm-egl-server Plugin:
+## DrmEglServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(drm-egl-server
+qt_add_plugin(DrmEglServerBufferPlugin
+    OUTPUT_NAME drm-egl-server
     TYPE wayland-graphics-integration-client
-    CLASS_NAME DrmEglServerBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/drm-egl-server
-    LIBRARIES
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         EGL::EGL
         Qt::Core
         Qt::Gui
-        Qt::WaylandClient
+        Qt::OpenGL
+        Qt::WaylandClientPrivate
         Wayland::Client
 )
 
-qt6_generate_wayland_protocol_client_sources(drm-egl-server
+qt6_generate_wayland_protocol_client_sources(DrmEglServerBufferPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/drm-egl-server/../../../extensions/drm-egl-server-buffer.xml
 )
diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt
index ca1738f50..24cc9219e 100644
--- a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt
@@ -1,28 +1,26 @@
 # Generated from libhybris-egl-server.pro.
 
 #####################################################################
-## libhybris-egl-server Plugin:
+## LibHybrisEglServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(libhybris-egl-server
+qt_add_plugin(LibHybrisEglServerBufferPlugin
+    OUTPUT_NAME libhybris-egl-server
     TYPE wayland-graphics-integration-client
-    CLASS_NAME LibHybrisEglServerBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/libhybris-egl-server
-    LIBRARIES
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         EGL::EGL
         Qt::Core
         Qt::Gui
-        Qt::WaylandClient
+        Qt::WaylandClientPrivate
         Wayland::Client
 )
 
-qt6_generate_wayland_protocol_client_sources(libhybris-egl-server
+qt6_generate_wayland_protocol_client_sources(LibHybrisEglServerBufferPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/libhybris-egl-server/../../../extensions/libhybris-egl-server-buffer.xml
 )
diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
index d7a7294ec..aa6e44331 100644
--- a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
@@ -1,27 +1,26 @@
 # Generated from shm-emulation-server.pro.
 
 #####################################################################
-## shm-emulation-server Plugin:
+## ShmServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(shm-emulation-server
+qt_add_plugin(ShmServerBufferPlugin
+    OUTPUT_NAME shm-emulation-server
     TYPE wayland-graphics-integration-client
-    CLASS_NAME ShmServerBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/shm-emulation-server
-    LIBRARIES
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::WaylandClient
+        Qt::OpenGL
+        Qt::WaylandClientPrivate
         Wayland::Client
 )
 
-qt6_generate_wayland_protocol_client_sources(shm-emulation-server
+qt6_generate_wayland_protocol_client_sources(ShmServerBufferPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/shm-emulation-server/../../../extensions/shm-emulation-server-buffer.xml
 )
diff --git a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
index 46ad01249..64ea378fa 100644
--- a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
@@ -1,27 +1,26 @@
 # Generated from vulkan-server.pro.
 
 #####################################################################
-## vulkan-server Plugin:
+## VulkanServerBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(vulkan-server
+qt_add_plugin(VulkanServerBufferPlugin
+    OUTPUT_NAME vulkan-server
     TYPE wayland-graphics-integration-client
-    CLASS_NAME VulkanServerBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/vulkan-server
-    LIBRARIES
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::WaylandClient
+        Qt::OpenGL
+        Qt::WaylandClientPrivate
         Wayland::Client
 )
 
-qt6_generate_wayland_protocol_client_sources(vulkan-server
+qt6_generate_wayland_protocol_client_sources(VulkanServerBufferPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/vulkan-server/../../../extensions/qt-vulkan-server-buffer-unstable-v1.xml
 )
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
index cbe1b6a9f..2eaf092cc 100644
--- a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from wayland-egl.pro.
 
 #####################################################################
-## qt-plugin-wayland-egl Plugin:
+## QWaylandEglClientBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qt-plugin-wayland-egl
+qt_add_plugin(QWaylandEglClientBufferPlugin
+    OUTPUT_NAME qt-plugin-wayland-egl
     TYPE wayland-graphics-integration-client
-    CLASS_NAME QWaylandEglClientBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
         ../../../../hardwareintegration/client/wayland-egl/qwaylandeglinclude.h
@@ -15,15 +15,13 @@ qt_add_plugin(qt-plugin-wayland-egl
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/wayland-egl
-    LIBRARIES
-        Qt::EglSupportPrivate
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         EGL::EGL
         Qt::Core
-        Qt::EglSupport
+        Qt::EglSupportPrivate
         Qt::Gui
-        Qt::WaylandClient
+        Qt::OpenGLPrivate
+        Qt::WaylandClientPrivate
         Wayland::Client
         Wayland::Egl
 )
diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
index a4b6e2741..972cb1ace 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from xcomposite-egl.pro.
 
 #####################################################################
-## xcomposite-egl Plugin:
+## QWaylandXCompositeEglClientBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(xcomposite-egl
+qt_add_plugin(QWaylandXCompositeEglClientBufferPlugin
+    OUTPUT_NAME xcomposite-egl
     TYPE wayland-graphics-integration-client
-    CLASS_NAME QWaylandXCompositeEglClientBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
         ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
@@ -16,21 +16,18 @@ qt_add_plugin(xcomposite-egl
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/xcomposite-egl
         ../../../../hardwareintegration/client/xcomposite_share
-    LIBRARIES
-        Qt::EglSupportPrivate
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         EGL::EGL
         PkgConfig::XComposite
         Qt::Core
-        Qt::EglSupport
+        Qt::EglSupportPrivate
         Qt::Gui
-        Qt::WaylandClient
+        Qt::WaylandClientPrivate
         Wayland::Client
         X11::X11
 )
 
-qt6_generate_wayland_protocol_client_sources(xcomposite-egl
+qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeEglClientBufferPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml
 )
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
index 179dd8db2..d074fe4ee 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from xcomposite-glx.pro.
 
 #####################################################################
-## xcomposite-glx Plugin:
+## QWaylandXCompositeGlxClientBufferPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(xcomposite-glx
+qt_add_plugin(QWaylandXCompositeGlxClientBufferPlugin
+    OUTPUT_NAME xcomposite-glx
     TYPE wayland-graphics-integration-client
-    CLASS_NAME QWaylandXCompositeGlxClientBufferPlugin
     SOURCES
         ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
         ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
@@ -16,21 +16,18 @@ qt_add_plugin(xcomposite-glx
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/xcomposite-glx
         ../../../../hardwareintegration/client/xcomposite_share
-    LIBRARIES
-        Qt::GlxSupportPrivate
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
         PkgConfig::XComposite
         Qt::Core
-        Qt::GlxSupport
+        Qt::GlxSupportPrivate
         Qt::Gui
-        Qt::WaylandClient
+        Qt::WaylandClientPrivate
         Wayland::Client
         X11::X11
 )
 
-qt6_generate_wayland_protocol_client_sources(xcomposite-glx
+qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeGlxClientBufferPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml
 )