CMake: Regenerate projects using pro2cmake one last time

Pick-to: 6.0
Change-Id: Ia5383c8ac8b375e493ae1c73ecc1270f857be24d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

7 files changed, 287 insertions, 6 deletions

diff --git a/examples/wayland/custom-extension/compositor/.prev_CMakeLists.txt b/examples/wayland/custom-extension/compositor/.prev_CMakeLists.txt
new file mode 100644
index 00000000..de5eafd9
--- /dev/null
+++ b/examples/wayland/custom-extension/compositor/.prev_CMakeLists.txt
@@ -0,0 +1,62 @@
+# Generated from compositor.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(custom-extension-compositor LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/custom-extension/compositor")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Qml)
+find_package(Qt6 COMPONENTS WaylandCompositor)
+
+qt_add_executable(custom-extension-compositor
+    customextension.cpp customextension.h
+    main.cpp
+)
+
+qt6_generate_wayland_protocol_server_sources(custom-extension-compositor
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml
+)
+set_target_properties(custom-extension-compositor PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(custom-extension-compositor PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::WaylandCompositor
+)
+
+
+# Resources:
+set(compositor_resource_files
+    "images/background.png"
+    "qml/CompositorScreen.qml"
+    "qml/main.qml"
+)
+
+qt6_add_resources(custom-extension-compositor "compositor"
+    PREFIX
+        "/"
+    FILES
+        ${compositor_resource_files}
+)
+
+install(TARGETS custom-extension-compositor
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/wayland/custom-extension/cpp-client/.prev_CMakeLists.txt b/examples/wayland/custom-extension/cpp-client/.prev_CMakeLists.txt
new file mode 100644
index 00000000..3cb61a54
--- /dev/null
+++ b/examples/wayland/custom-extension/cpp-client/.prev_CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from cpp-client.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(custom-extension-cpp-client LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/custom-extension/cpp-client")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS WaylandClient)
+
+qt_add_executable(custom-extension-cpp-client
+    ../client-common/customextension.cpp ../client-common/customextension.h
+    main.cpp
+)
+
+qt6_generate_wayland_protocol_client_sources(custom-extension-cpp-client
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml
+)
+set_target_properties(custom-extension-cpp-client PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(custom-extension-cpp-client PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::GuiPrivate
+    Qt::WaylandClient
+)
+
+install(TARGETS custom-extension-cpp-client
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/wayland/custom-extension/qml-client/.prev_CMakeLists.txt b/examples/wayland/custom-extension/qml-client/.prev_CMakeLists.txt
new file mode 100644
index 00000000..7b68ecbc
--- /dev/null
+++ b/examples/wayland/custom-extension/qml-client/.prev_CMakeLists.txt
@@ -0,0 +1,63 @@
+# Generated from qml-client.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(custom-extension-qml-client LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/custom-extension/qml-client")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Qml)
+find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 COMPONENTS WaylandClient)
+
+qt_add_executable(custom-extension-qml-client
+    ../client-common/customextension.cpp ../client-common/customextension.h
+    main.cpp
+)
+
+qt6_generate_wayland_protocol_client_sources(custom-extension-qml-client
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml
+)
+set_target_properties(custom-extension-qml-client PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(custom-extension-qml-client PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::GuiPrivate
+    Qt::Qml
+    Qt::Quick
+    Qt::WaylandClient
+)
+
+
+# Resources:
+set(qml_resource_files
+    "main.qml"
+)
+
+qt6_add_resources(custom-extension-qml-client "qml"
+    PREFIX
+        "/"
+    FILES
+        ${qml_resource_files}
+)
+
+install(TARGETS custom-extension-qml-client
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/wayland/server-buffer/compositor/.prev_CMakeLists.txt b/examples/wayland/server-buffer/compositor/.prev_CMakeLists.txt
new file mode 100644
index 00000000..513e73bb
--- /dev/null
+++ b/examples/wayland/server-buffer/compositor/.prev_CMakeLists.txt
@@ -0,0 +1,62 @@
+# Generated from compositor.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(compositor LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/server-buffer/compositor")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Qml)
+find_package(Qt6 COMPONENTS WaylandCompositor)
+
+qt_add_executable(compositor
+    main.cpp
+    sharebufferextension.cpp sharebufferextension.h
+)
+
+qt6_generate_wayland_protocol_server_sources(compositor
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../share-buffer.xml
+)
+set_target_properties(compositor PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(compositor PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::WaylandCompositorPrivate
+)
+
+
+# Resources:
+set(compositor_resource_files
+    "images/Siberischer_tiger_de_edit02.jpg"
+    "images/background.png"
+    "qml/main.qml"
+)
+
+qt6_add_resources(compositor "compositor"
+    PREFIX
+        "/"
+    FILES
+        ${compositor_resource_files}
+)
+
+install(TARGETS compositor
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/wayland/server-buffer/cpp-client/.prev_CMakeLists.txt b/examples/wayland/server-buffer/cpp-client/.prev_CMakeLists.txt
new file mode 100644
index 00000000..438bd3a5
--- /dev/null
+++ b/examples/wayland/server-buffer/cpp-client/.prev_CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from cpp-client.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(server-buffer-cpp-client LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/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)
+
+qt_add_executable(server-buffer-cpp-client
+    main.cpp
+    sharebufferextension.cpp sharebufferextension.h
+)
+
+qt6_generate_wayland_protocol_client_sources(server-buffer-cpp-client
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../share-buffer.xml
+)
+set_target_properties(server-buffer-cpp-client PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+target_link_libraries(server-buffer-cpp-client PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::GuiPrivate
+    Qt::OpenGL
+    Qt::WaylandClientPrivate
+)
+
+install(TARGETS server-buffer-cpp-client
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt
index 3cb4692e..dac26fe7 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt
@@ -1,10 +1,10 @@
 # Generated from wayland-eglstream-controller.pro.
 
 #####################################################################
-## QWaylandEglStreamBufferIntegrationPlugin Plugin:
+## QWaylandEglStreamClientBufferIntegrationPlugin Plugin:
 #####################################################################
 
-qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin
+qt_internal_add_plugin(QWaylandEglStreamClientBufferIntegrationPlugin
     OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller
     TYPE wayland-graphics-integration-server
     SOURCES
@@ -24,7 +24,7 @@ qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin
         Qt::WaylandCompositorPrivate
 )
 
-qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamBufferIntegrationPlugin
+qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamClientBufferIntegrationPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml
 )
diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
index 3cbe8f82..af8d167a 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Generated from wayland-eglstream-controller.pro.
 
 #####################################################################
-## QWaylandEglStreamBufferIntegrationPlugin Plugin:
+## QWaylandEglStreamClientBufferIntegrationPlugin Plugin:
 #####################################################################
 qt_find_package(EGL) # special case
 
-qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin
+qt_internal_add_plugin(QWaylandEglStreamClientBufferIntegrationPlugin
     OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller
     TYPE wayland-graphics-integration-server
     SOURCES
@@ -25,7 +25,7 @@ qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin
         Qt::WaylandCompositorPrivate
 )
 
-qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamBufferIntegrationPlugin
+qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamClientBufferIntegrationPlugin
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml
 )