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>

5 files changed, 8 insertions, 24 deletions

diff --git a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt
index 8f3708a19..ffdc34b70 100644
--- a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt
+++ b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt
@@ -24,13 +24,10 @@ qt6_generate_wayland_protocol_client_sources(custom-extension-cpp-client
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml
 )
-target_link_libraries(custom-extension-cpp-client PRIVATE
-    Qt::GuiPrivate
-)
-
 target_link_libraries(custom-extension-cpp-client PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::GuiPrivate
     Qt::WaylandClient
 )
 
diff --git a/examples/wayland/custom-extension/qml-client/CMakeLists.txt b/examples/wayland/custom-extension/qml-client/CMakeLists.txt
index f490b507d..9ce56593b 100644
--- a/examples/wayland/custom-extension/qml-client/CMakeLists.txt
+++ b/examples/wayland/custom-extension/qml-client/CMakeLists.txt
@@ -26,13 +26,10 @@ qt6_generate_wayland_protocol_client_sources(custom-extension-qml-client
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml
 )
-target_link_libraries(custom-extension-qml-client PRIVATE
-    Qt::GuiPrivate
-)
-
 target_link_libraries(custom-extension-qml-client PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::GuiPrivate
     Qt::Qml
     Qt::Quick
     Qt::WaylandClient
diff --git a/examples/wayland/server-buffer/compositor/CMakeLists.txt b/examples/wayland/server-buffer/compositor/CMakeLists.txt
index dc47cfe0c..932f4be08 100644
--- a/examples/wayland/server-buffer/compositor/CMakeLists.txt
+++ b/examples/wayland/server-buffer/compositor/CMakeLists.txt
@@ -25,15 +25,11 @@ qt6_generate_wayland_protocol_server_sources(compositor
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../share-buffer.xml
 )
-target_link_libraries(compositor PRIVATE
-    Qt::WaylandCompositorPrivate
-)
-
 target_link_libraries(compositor PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
-    Qt::WaylandCompositor
+    Qt::WaylandCompositorPrivate
 )
 
 
diff --git a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt b/examples/wayland/server-buffer/cpp-client/CMakeLists.txt
index 5b4c1e95c..2f33057fe 100644
--- a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt
+++ b/examples/wayland/server-buffer/cpp-client/CMakeLists.txt
@@ -14,6 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples/wayland/server-buffer/cpp-client")
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS WaylandClient)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(server-buffer-cpp-client
     main.cpp
@@ -24,15 +25,12 @@ qt6_generate_wayland_protocol_client_sources(server-buffer-cpp-client
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../share-buffer.xml
 )
-target_link_libraries(server-buffer-cpp-client PRIVATE
-    Qt::GuiPrivate
-    Qt::WaylandClientPrivate
-)
-
 target_link_libraries(server-buffer-cpp-client PUBLIC
     Qt::Core
     Qt::Gui
-    Qt::WaylandClient
+    Qt::GuiPrivate
+    Qt::OpenGL
+    Qt::WaylandClientPrivate
 )
 
 install(TARGETS server-buffer-cpp-client
diff --git a/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt b/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt
index ea56f9c3f..a6127f584 100644
--- a/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt
+++ b/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt
@@ -19,15 +19,11 @@ find_package(Qt6 COMPONENTS WaylandCompositor)
 add_qt_gui_executable(texture-sharing-custom-compositor
     main.cpp
 )
-target_link_libraries(texture-sharing-custom-compositor PRIVATE
-    Qt::WaylandCompositorPrivate
-)
-
 target_link_libraries(texture-sharing-custom-compositor PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
-    Qt::WaylandCompositor
+    Qt::WaylandCompositorPrivate
 )