diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-24 16:23:53 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 09:57:22 +0000 |
commit | e4cb32970cc1111d7bce95293e6766a879a6b5f7 (patch) | |
tree | c637be5f9e9a654c949dc2ce00d60c3c97ba8f99 /src/plugins/hardwareintegration | |
parent | b77269ff500e184237d523496e17639c94009ac8 (diff) | |
download | qtwayland-e4cb32970cc1111d7bce95293e6766a879a6b5f7.tar.gz |
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>
Diffstat (limited to 'src/plugins/hardwareintegration')
22 files changed, 146 insertions, 185 deletions
diff --git a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt index e02b020e..038a8843 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 41d7c12e..f31e868a 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 337857cc..ce3f9425 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 ca1738f5..24cc9219 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 d7a7294e..aa6e4433 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 46ad0124..64ea378f 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 cbe1b6a9..2eaf092c 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 a4b6e274..972cb1ac 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 179dd8db..d074fe4e 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 ) diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt index cbe9a8de..fb3dc1ad 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from brcm-egl.pro. ##################################################################### -## qt-wayland-compositor-brcm-egl Plugin: +## QWaylandBrcmClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-brcm-egl +qt_add_plugin(QWaylandBrcmClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-brcm-egl TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandBrcmClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.h ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.h @@ -14,17 +14,15 @@ qt_add_plugin(qt-wayland-compositor-brcm-egl INCLUDE_DIRECTORIES ../../../../hardwareintegration/compositor/brcm-egl LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-brcm-egl +qt6_generate_wayland_protocol_server_sources(QWaylandBrcmClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/brcm-egl/../../../extensions/brcm.xml ) diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt index eb66943e..80cfd59b 100644 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from dmabuf-server.pro. ##################################################################### -## qt-wayland-compositor-dmabuf-server-buffer Plugin: +## DmaBufServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-dmabuf-server-buffer +qt_add_plugin(DmaBufServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-dmabuf-server-buffer TYPE wayland-graphics-integration-server - CLASS_NAME DmaBufServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h main.cpp @@ -14,17 +14,16 @@ qt_add_plugin(qt-wayland-compositor-dmabuf-server-buffer ../../../../hardwareintegration/compositor/dmabuf-server LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate + Libdrm::Libdrm Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-dmabuf-server-buffer +qt6_generate_wayland_protocol_server_sources(DmaBufServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/dmabuf-server/../../../extensions/qt-dmabuf-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt index 75803bbe..95c726fe 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from drm-egl-server.pro. ##################################################################### -## qt-wayland-compositor-drm-egl-server-buffer Plugin: +## DrmEglServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-drm-egl-server-buffer +qt_add_plugin(DrmEglServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-drm-egl-server-buffer TYPE wayland-graphics-integration-server - CLASS_NAME DrmEglServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h main.cpp @@ -14,17 +14,15 @@ qt_add_plugin(qt-wayland-compositor-drm-egl-server-buffer ../../../../hardwareintegration/compositor/drm-egl-server LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-drm-egl-server-buffer +qt6_generate_wayland_protocol_server_sources(DrmEglServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/drm-egl-server/../../../extensions/drm-egl-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt index c10ce110..f1040f7d 100644 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from vsp2.pro. ##################################################################### -## qt-wayland-compositor-vsp2 Plugin: +## Vsp2HardwareLayerIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-vsp2 +qt_add_plugin(Vsp2HardwareLayerIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-vsp2 TYPE wayland-hardware-layer-integration - CLASS_NAME Vsp2HardwareLayerIntegrationPlugin SOURCES ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h main.cpp @@ -14,14 +14,12 @@ qt_add_plugin(qt-wayland-compositor-vsp2 ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2 LIBRARIES PkgConfig::Waylandkms - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) #### Keys ignored in scope 1:.:.:vsp2.pro:<TRUE>: diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt index 0dc08b7a..f0e6bec6 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from libhybris-egl-server.pro. ##################################################################### -## qt-wayland-compositor-libybris-egl-server.json Plugin: +## LibHybrisEglServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-libybris-egl-server.json +qt_add_plugin(LibHybrisEglServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-libybris-egl-server.json TYPE wayland-graphics-integration-server - CLASS_NAME LibHybrisEglServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h main.cpp @@ -14,17 +14,15 @@ qt_add_plugin(qt-wayland-compositor-libybris-egl-server.json ../../../../hardwareintegration/compositor/libhybris-egl-server LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-libybris-egl-server.json +qt6_generate_wayland_protocol_server_sources(LibHybrisEglServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/libhybris-egl-server/../../../extensions/libhybris-egl-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt index 6d0a7039..35ffd7dc 100644 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from linux-dmabuf-unstable-v1.pro. ##################################################################### -## qt-wayland-compositor-linux-dmabuf-unstable-v1 Plugin: +## QWaylandDmabufClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-linux-dmabuf-unstable-v1 +qt_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-linux-dmabuf-unstable-v1 TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandDmabufClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h @@ -15,19 +15,17 @@ qt_add_plugin(qt-wayland-compositor-linux-dmabuf-unstable-v1 ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1 LIBRARIES EGL::EGL + Libdrm::Libdrm + Wayland::Server + PUBLIC_LIBRARIES Qt::CorePrivate Qt::EglSupportPrivate Qt::GuiPrivate - Qt::WaylandCompositorPrivate - Wayland::Server - PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::Gui Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-linux-dmabuf-unstable-v1 +qt6_generate_wayland_protocol_server_sources(QWaylandDmabufClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/../../../3rdparty/protocol/linux-dmabuf-unstable-v1.xml ) diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt index d49a0600..707a5380 100644 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt @@ -1,29 +1,27 @@ # Generated from shm-emulation-server.pro. ##################################################################### -## qt-wayland-compositor-shm-emulation-server Plugin: +## ShmServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-shm-emulation-server +qt_add_plugin(ShmServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-shm-emulation-server TYPE wayland-graphics-integration-server - CLASS_NAME ShmServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/compositor/shm-emulation-server LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-shm-emulation-server +qt6_generate_wayland_protocol_server_sources(ShmServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/shm-emulation-server/../../../extensions/shm-emulation-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt index e666e144..472728a6 100644 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from vulkan-server.pro. ##################################################################### -## qt-wayland-compositor-vulkan-server Plugin: +## VulkanServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-vulkan-server +qt_add_plugin(VulkanServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-vulkan-server TYPE wayland-graphics-integration-server - CLASS_NAME VulkanServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.h @@ -15,19 +15,16 @@ qt_add_plugin(qt-wayland-compositor-vulkan-server ../../../../hardwareintegration/compositor/vulkan-server ../../../../hardwareintegration/compositor/vulkan-server/../../../3rdparty/util LIBRARIES + Wayland::Server + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::VulkanSupportPrivate - Qt::WaylandCompositorPrivate - Wayland::Server - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::VulkanSupport Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-vulkan-server +qt6_generate_wayland_protocol_server_sources(VulkanServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/vulkan-server/../../../extensions/qt-vulkan-server-buffer-unstable-v1.xml ) diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt index 558403a1..ea307288 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from wayland-egl.pro. ##################################################################### -## qt-wayland-compositor-wayland-egl Plugin: +## QWaylandEglClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-wayland-egl +qt_add_plugin(QWaylandEglClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-wayland-egl TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandEglClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h main.cpp @@ -14,17 +14,14 @@ qt_add_plugin(qt-wayland-compositor-wayland-egl ../../../../hardwareintegration/compositor/wayland-egl LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::EglSupportPrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Egl Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::Gui + Qt::CorePrivate + Qt::EglSupportPrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) #### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>: diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt index 5d1cacc0..10932f15 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from wayland-eglstream-controller.pro. ##################################################################### -## qt-wayland-compositor-wayland-eglstream-controller Plugin: +## QWaylandEglStreamBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-wayland-eglstream-controller +qt_add_plugin(QWaylandEglStreamBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandEglStreamBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h @@ -15,20 +15,17 @@ qt_add_plugin(qt-wayland-compositor-wayland-eglstream-controller ../../../../hardwareintegration/compositor/wayland-eglstream-controller LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::EglSupportPrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Egl Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::Gui + Qt::CorePrivate + Qt::EglSupportPrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-wayland-eglstream-controller +qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml ) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt index 76dee284..c8beed39 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-egl.pro. ##################################################################### -## qt-wayland-compositor-xcomposite-egl Plugin: +## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-xcomposite-egl +qt_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-xcomposite-egl TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandXCompositeEglClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h @@ -18,19 +18,19 @@ qt_add_plugin(qt-wayland-compositor-xcomposite-egl ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server X11::X11 PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-xcomposite-egl +qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeEglClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt index 450a9df7..99727354 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-glx.pro. ##################################################################### -## qt-wayland-compositor-xcomposite-glx Plugin: +## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-xcomposite-glx +qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-xcomposite-glx TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandXCompositeGlxClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h @@ -17,18 +17,18 @@ qt_add_plugin(qt-wayland-compositor-xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-xcomposite-glx +qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt index ecb8066d..b625c22b 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-glx.pro. ##################################################################### -## qt-wayland-compositor-xcomposite-glx Plugin: +## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-xcomposite-glx +qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-xcomposite-glx TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandXCompositeGlxClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h @@ -17,19 +17,19 @@ qt_add_plugin(qt-wayland-compositor-xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES - Qt::CorePrivate Qt::GlxSupportPrivate # special case - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-xcomposite-glx +qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml |