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>

6 files changed, 32 insertions, 47 deletions

diff --git a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt
index ed42a728..554f24ba 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qwayland-brcm-egl.pro.
 
 #####################################################################
-## qwayland-brcm-egl Plugin:
+## QWaylandBrcmEglPlatformIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwayland-brcm-egl
+qt_add_plugin(QWaylandBrcmEglPlatformIntegrationPlugin
+    OUTPUT_NAME qwayland-brcm-egl
     TYPE platforms
-    CLASS_NAME QWaylandBrcmEglPlatformIntegrationPlugin
     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(qwayland-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(qwayland-brcm-egl
+qt6_generate_wayland_protocol_client_sources(QWaylandBrcmEglPlatformIntegrationPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/brcm-egl/../../../extensions/brcm.xml
 )
diff --git a/src/plugins/platforms/qwayland-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-egl/CMakeLists.txt
index 03cfdfcc..5a4e3626 100644
--- a/src/plugins/platforms/qwayland-egl/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-egl/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qwayland-egl.pro.
 
 #####################################################################
-## qwayland-egl Plugin:
+## QWaylandEglPlatformIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwayland-egl
+qt_add_plugin(QWaylandEglPlatformIntegrationPlugin
+    OUTPUT_NAME qwayland-egl
     TYPE platforms
-    CLASS_NAME QWaylandEglPlatformIntegrationPlugin
     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(qwayland-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/platforms/qwayland-generic/.prev_CMakeLists.txt b/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt
index d3d71e3f..a6d932cd 100644
--- a/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt
@@ -1,20 +1,18 @@
 # Generated from qwayland-generic.pro.
 
 #####################################################################
-## qwayland-generic Plugin:
+## QWaylandIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwayland-generic
+qt_add_plugin(QWaylandIntegrationPlugin
+    OUTPUT_NAME qwayland-generic
     TYPE platforms
-    CLASS_NAME QWaylandIntegrationPlugin
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::WaylandClient
+        Qt::WaylandClientPrivate
 )
 
 #### Keys ignored in scope 1:.:.:qwayland-generic.pro:<TRUE>:
diff --git a/src/plugins/platforms/qwayland-generic/CMakeLists.txt b/src/plugins/platforms/qwayland-generic/CMakeLists.txt
index e512e5b0..342e7118 100644
--- a/src/plugins/platforms/qwayland-generic/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-generic/CMakeLists.txt
@@ -1,21 +1,19 @@
 # Generated from qwayland-generic.pro.
 
 #####################################################################
-## qwayland-generic Plugin:
+## QWaylandIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwayland-generic
+qt_add_plugin(QWaylandIntegrationPlugin
+    OUTPUT_NAME qwayland-generic
     TYPE platforms
-    CLASS_NAME QWaylandIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wayland # special case
     SOURCES
         main.cpp
-    LIBRARIES
-        Qt::WaylandClientPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::WaylandClient
+        Qt::WaylandClientPrivate
 )
 
 #### Keys ignored in scope 1:.:.:qwayland-generic.pro:<TRUE>:
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
index c0dbf536..4b84b449 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qwayland-xcomposite-egl.pro.
 
 #####################################################################
-## qwayland-xcomposite-egl Plugin:
+## QWaylandXCompositeEglPlatformIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwayland-xcomposite-egl
+qt_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin
+    OUTPUT_NAME qwayland-xcomposite-egl
     TYPE platforms
-    CLASS_NAME QWaylandXCompositeEglPlatformIntegrationPlugin
     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(qwayland-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(qwayland-xcomposite-egl
+qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeEglPlatformIntegrationPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml
 )
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
index ac8dce83..1ff3c5ff 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qwayland-xcomposite-glx.pro.
 
 #####################################################################
-## qwayland-xcomposite-glx Plugin:
+## QWaylandXCompositeGlxPlatformIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwayland-xcomposite-glx
+qt_add_plugin(QWaylandXCompositeGlxPlatformIntegrationPlugin
+    OUTPUT_NAME qwayland-xcomposite-glx
     TYPE platforms
-    CLASS_NAME QWaylandXCompositeGlxPlatformIntegrationPlugin
     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
@@ -17,21 +17,18 @@ qt_add_plugin(qwayland-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(qwayland-xcomposite-glx
+qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeGlxPlatformIntegrationPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml
 )