diff --git a/src/plugins/platforms/wayland/.prev_CMakeLists.txt b/src/plugins/platforms/wayland/.prev_CMakeLists.txt index 274cf70d670..58861b94514 100644 --- a/src/plugins/platforms/wayland/.prev_CMakeLists.txt +++ b/src/plugins/platforms/wayland/.prev_CMakeLists.txt @@ -40,6 +40,7 @@ qt_add_module(WaylandClient qwaylandshmwindow.cpp qwaylandshmwindow_p.h qwaylandsubsurface.cpp qwaylandsubsurface_p.h qwaylandsurface.cpp qwaylandsurface_p.h + qwaylandtabletv2.cpp qwaylandtabletv2_p.h qwaylandtouch.cpp qwaylandtouch_p.h qwaylandwindow.cpp qwaylandwindow_p.h qwaylandwindowmanagerintegration.cpp qwaylandwindowmanagerintegration_p.h @@ -63,10 +64,14 @@ qt_add_module(WaylandClient Qt::Core Qt::Gui Wayland::Client + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate ) qt6_generate_wayland_protocol_client_sources(WaylandClient FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/tablet-unstable-v2.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v2.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wp-primary-selection-unstable-v1.xml @@ -99,9 +104,14 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon Qt::XkbCommonSupportPrivate ) -qt_extend_target(WaylandClient CONDITION TARGET linuxaccessibility_support_private +qt_extend_target(WaylandClient CONDITION TARGET Qt::PlatformCompositorSupportPrivate LIBRARIES - linuxaccessibility_support_private + Qt::PlatformCompositorSupportPrivate +) + +qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate + LIBRARIES + Qt::LinuxAccessibilitySupportPrivate ) qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt index 1338651794c..248f7213665 100644 --- a/src/plugins/platforms/wayland/CMakeLists.txt +++ b/src/plugins/platforms/wayland/CMakeLists.txt @@ -40,6 +40,7 @@ qt_add_module(WaylandClient qwaylandshmwindow.cpp qwaylandshmwindow_p.h qwaylandsubsurface.cpp qwaylandsubsurface_p.h qwaylandsurface.cpp qwaylandsurface_p.h + qwaylandtabletv2.cpp qwaylandtabletv2_p.h qwaylandtouch.cpp qwaylandtouch_p.h qwaylandwindow.cpp qwaylandwindow_p.h qwaylandwindowmanagerintegration.cpp qwaylandwindowmanagerintegration_p.h @@ -63,10 +64,15 @@ qt_add_module(WaylandClient Qt::Core Qt::Gui Wayland::Client + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate + Qt::ServiceSupportPrivate # special case QTBUG-83063 ) qt6_generate_wayland_protocol_client_sources(WaylandClient FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/tablet-unstable-v2.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v2.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wp-primary-selection-unstable-v1.xml @@ -97,11 +103,18 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon LIBRARIES Qt::XkbCommonSupportPrivate + PRIVATE_MODULE_INTERFACE # special case QTBUG-83063 + Qt::XkbCommonSupportPrivate # special case ) -qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate # special case +qt_extend_target(WaylandClient CONDITION TARGET Qt::PlatformCompositorSupportPrivate LIBRARIES - Qt::LinuxAccessibilitySupportPrivate # special case + Qt::PlatformCompositorSupportPrivate +) + +qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate + LIBRARIES + Qt::LinuxAccessibilitySupportPrivate ) qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard diff --git a/src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt index 760718cac7c..9bd875a40c9 100644 --- a/src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt @@ -1,20 +1,18 @@ # Generated from bradient.pro. ##################################################################### -## bradient Plugin: +## QWaylandBradientDecorationPlugin Plugin: ##################################################################### -qt_add_plugin(bradient +qt_add_plugin(QWaylandBradientDecorationPlugin + OUTPUT_NAME bradient TYPE wayland-decoration-client - CLASS_NAME QWaylandBradientDecorationPlugin SOURCES main.cpp - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::WaylandClientPrivate Wayland::Client ) diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/CMakeLists.txt index e02b020e6df..038a8843c0f 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/dmabuf-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/CMakeLists.txt index 41d7c12e252..f31e868ac8c 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/drm-egl-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/CMakeLists.txt index 337857cc259..ce3f9425408 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/CMakeLists.txt index ca1738f50f3..24cc9219e04 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/CMakeLists.txt index d7a7294ec9a..aa6e443311c 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/vulkan-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/CMakeLists.txt index 46ad01249d2..64ea378faad 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt index cbe1b6a9f9a..2eaf092ccf5 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/CMakeLists.txt index a4b6e27413b..972cb1ace27 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/CMakeLists.txt index 179dd8db2e5..d074fe4ee3d 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt index 7cc47c75729..9e068dfe280 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt @@ -1,27 +1,25 @@ # Generated from fullscreen-shell-v1.pro. ##################################################################### -## fullscreen-shell-v1 Plugin: +## QWaylandFullScreenShellV1IntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(fullscreen-shell-v1 +qt_add_plugin(QWaylandFullScreenShellV1IntegrationPlugin + OUTPUT_NAME fullscreen-shell-v1 TYPE wayland-shell-integration - CLASS_NAME QWaylandFullScreenShellV1IntegrationPlugin SOURCES main.cpp qwaylandfullscreenshellv1integration.cpp qwaylandfullscreenshellv1integration.h qwaylandfullscreenshellv1surface.cpp qwaylandfullscreenshellv1surface.h - LIBRARIES - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(fullscreen-shell-v1 +qt6_generate_wayland_protocol_client_sources(QWaylandFullScreenShellV1IntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/fullscreen-shell-unstable-v1.xml ) diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt index 85891524287..496bbe68c09 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt @@ -1,27 +1,25 @@ # Generated from wl-shell.pro. ##################################################################### -## wl-shell Plugin: +## QWaylandWlShellIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(wl-shell +qt_add_plugin(QWaylandWlShellIntegrationPlugin + OUTPUT_NAME wl-shell TYPE wayland-shell-integration - CLASS_NAME QWaylandWlShellIntegrationPlugin SOURCES main.cpp qwaylandwlshellintegration.cpp qwaylandwlshellintegration_p.h qwaylandwlshellsurface.cpp qwaylandwlshellsurface_p.h - LIBRARIES - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(wl-shell +qt6_generate_wayland_protocol_client_sources(QWaylandWlShellIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland.xml ) @@ -32,7 +30,7 @@ qt6_generate_wayland_protocol_client_sources(wl-shell ## Scopes: ##################################################################### -qt_extend_target(wl-shell CONDITION QT_FEATURE_xkbcommon +qt_extend_target(QWaylandWlShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon LIBRARIES XKB::XKB ) diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt index 3fa2ba746a4..fec8b2c89a2 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xdg-shell-v5.pro. ##################################################################### -## xdg-shell-v5 Plugin: +## QWaylandXdgShellV5IntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(xdg-shell-v5 +qt_add_plugin(QWaylandXdgShellV5IntegrationPlugin + OUTPUT_NAME xdg-shell-v5 TYPE wayland-shell-integration - CLASS_NAME QWaylandXdgShellV5IntegrationPlugin SOURCES main.cpp pregenerated/3rdparty/qwayland-xdg-shell-unstable-v5.cpp pregenerated/3rdparty/qwayland-xdg-shell-unstable-v5_p.h @@ -18,13 +18,11 @@ qt_add_plugin(xdg-shell-v5 qwaylandxdgsurfacev5.cpp qwaylandxdgsurfacev5_p.h INCLUDE_DIRECTORIES pregenerated/3rdparty - LIBRARIES - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::WaylandClientPrivate Wayland::Client ) @@ -34,7 +32,7 @@ qt_add_plugin(xdg-shell-v5 ## Scopes: ##################################################################### -qt_extend_target(xdg-shell-v5 CONDITION QT_FEATURE_xkbcommon +qt_extend_target(QWaylandXdgShellV5IntegrationPlugin CONDITION QT_FEATURE_xkbcommon PUBLIC_LIBRARIES XKB::XKB ) diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt index d6fa7dd6a45..094610155fa 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt @@ -1,27 +1,25 @@ # Generated from xdg-shell-v6.pro. ##################################################################### -## xdg-shell-v6 Plugin: +## QWaylandXdgShellV6IntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(xdg-shell-v6 +qt_add_plugin(QWaylandXdgShellV6IntegrationPlugin + OUTPUT_NAME xdg-shell-v6 TYPE wayland-shell-integration - CLASS_NAME QWaylandXdgShellV6IntegrationPlugin SOURCES main.cpp qwaylandxdgshellv6.cpp qwaylandxdgshellv6_p.h qwaylandxdgshellv6integration.cpp qwaylandxdgshellv6integration_p.h - LIBRARIES - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(xdg-shell-v6 +qt6_generate_wayland_protocol_client_sources(QWaylandXdgShellV6IntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-shell-unstable-v6.xml ) @@ -32,7 +30,7 @@ qt6_generate_wayland_protocol_client_sources(xdg-shell-v6 ## Scopes: ##################################################################### -qt_extend_target(xdg-shell-v6 CONDITION QT_FEATURE_xkbcommon +qt_extend_target(QWaylandXdgShellV6IntegrationPlugin CONDITION QT_FEATURE_xkbcommon LIBRARIES XKB::XKB ) diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt index 96a02fc7f85..848a0ec603b 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt @@ -1,28 +1,26 @@ # Generated from xdg-shell.pro. ##################################################################### -## xdg-shell Plugin: +## QWaylandXdgShellIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(xdg-shell +qt_add_plugin(QWaylandXdgShellIntegrationPlugin + OUTPUT_NAME xdg-shell TYPE wayland-shell-integration - CLASS_NAME QWaylandXdgShellIntegrationPlugin SOURCES main.cpp qwaylandxdgdecorationv1.cpp qwaylandxdgdecorationv1_p.h qwaylandxdgshell.cpp qwaylandxdgshell_p.h qwaylandxdgshellintegration.cpp qwaylandxdgshellintegration_p.h - LIBRARIES - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(xdg-shell +qt6_generate_wayland_protocol_client_sources(QWaylandXdgShellIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-shell.xml @@ -34,7 +32,7 @@ qt6_generate_wayland_protocol_client_sources(xdg-shell ## Scopes: ##################################################################### -qt_extend_target(xdg-shell CONDITION QT_FEATURE_xkbcommon +qt_extend_target(QWaylandXdgShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon LIBRARIES XKB::XKB ) diff --git a/src/tools/qtwaylandscanner/.prev_CMakeLists.txt b/src/tools/qtwaylandscanner/.prev_CMakeLists.txt new file mode 100644 index 00000000000..bb413544cb5 --- /dev/null +++ b/src/tools/qtwaylandscanner/.prev_CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qtwaylandscanner.pro. + +##################################################################### +## qtwaylandscanner Tool: +##################################################################### + +qt_add_tool(qtwaylandscanner + SOURCES + qtwaylandscanner.cpp + PUBLIC_LIBRARIES + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:qtwaylandscanner.pro:: +# _OPTION = "host_build" diff --git a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake index 83e557ffd4d..6624c84f26e 100644 --- a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake +++ b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake @@ -37,7 +37,11 @@ function(qt6_generate_wayland_protocol_client_sources target) # TODO: We need this hack in order to get the xcomposite plugins to build... # unfortunately, it's not going to work outside QtWayland because we're using waylandclient-private includes set(qtwaylandscanner_code_include "") - set (targets_that_need_include "xcomposite-egl" "xcomposite-glx" "qwayland-xcomposite-egl" "qwayland-xcomposite-glx") + set (targets_that_need_include + "QWaylandXCompositeEglClientBufferPlugin" + "QWaylandXCompositeGlxClientBufferPlugin" + "QWaylandXCompositeEglPlatformIntegrationPlugin" + "QWaylandXCompositeGlxPlatformIntegrationPlugin") if ("${target}" IN_LIST targets_that_need_include OR is_for_module) set(qtwaylandscanner_code_include "") endif() diff --git a/tests/auto/wayland/CMakeLists.txt b/tests/auto/wayland/CMakeLists.txt index bd18ec3e185..5939853ccd4 100644 --- a/tests/auto/wayland/CMakeLists.txt +++ b/tests/auto/wayland/CMakeLists.txt @@ -4,11 +4,13 @@ add_subdirectory(client) add_subdirectory(datadevicev1) add_subdirectory(fullscreenshellv1) add_subdirectory(iviapplication) +add_subdirectory(nooutput) add_subdirectory(output) add_subdirectory(primaryselectionv1) add_subdirectory(seatv4) add_subdirectory(seatv5) add_subdirectory(surface) +add_subdirectory(tabletv2) add_subdirectory(wl_connect) add_subdirectory(xdgdecorationv1) add_subdirectory(xdgoutput) diff --git a/tests/auto/wayland/client/.prev_CMakeLists.txt b/tests/auto/wayland/client/.prev_CMakeLists.txt index 6fe4bb92d8c..c52ab320b98 100644 --- a/tests/auto/wayland/client/.prev_CMakeLists.txt +++ b/tests/auto/wayland/client/.prev_CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client tst_client.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client Wayland::Server ) diff --git a/tests/auto/wayland/client/CMakeLists.txt b/tests/auto/wayland/client/CMakeLists.txt index a20ea811ce8..f7e317c772e 100644 --- a/tests/auto/wayland/client/CMakeLists.txt +++ b/tests/auto/wayland/client/CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client tst_client.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client Wayland::Server Threads::Threads # special case diff --git a/tests/auto/wayland/datadevicev1/.prev_CMakeLists.txt b/tests/auto/wayland/datadevicev1/.prev_CMakeLists.txt index bfea1434910..97dedb85579 100644 --- a/tests/auto/wayland/datadevicev1/.prev_CMakeLists.txt +++ b/tests/auto/wayland/datadevicev1/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_datadevicev1 tst_datadevicev1.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/datadevicev1/CMakeLists.txt b/tests/auto/wayland/datadevicev1/CMakeLists.txt index ad58772d4b0..e635e33ce4a 100644 --- a/tests/auto/wayland/datadevicev1/CMakeLists.txt +++ b/tests/auto/wayland/datadevicev1/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_datadevicev1 tst_datadevicev1.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/fullscreenshellv1/.prev_CMakeLists.txt b/tests/auto/wayland/fullscreenshellv1/.prev_CMakeLists.txt index 5daef3bb3ff..c9e5eae13a8 100644 --- a/tests/auto/wayland/fullscreenshellv1/.prev_CMakeLists.txt +++ b/tests/auto/wayland/fullscreenshellv1/.prev_CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_fullscreenshellv1 tst_fullscreenshellv1.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client Wayland::Server ) diff --git a/tests/auto/wayland/fullscreenshellv1/CMakeLists.txt b/tests/auto/wayland/fullscreenshellv1/CMakeLists.txt index 00348df9948..73d92ead8ee 100644 --- a/tests/auto/wayland/fullscreenshellv1/CMakeLists.txt +++ b/tests/auto/wayland/fullscreenshellv1/CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_fullscreenshellv1 tst_fullscreenshellv1.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client Wayland::Server Threads::Threads # special case diff --git a/tests/auto/wayland/inputcontext/.prev_CMakeLists.txt b/tests/auto/wayland/inputcontext/.prev_CMakeLists.txt index d5df86a13eb..cf2301e770d 100644 --- a/tests/auto/wayland/inputcontext/.prev_CMakeLists.txt +++ b/tests/auto/wayland/inputcontext/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_inputcontext tst_inputcontext.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/inputcontext/CMakeLists.txt b/tests/auto/wayland/inputcontext/CMakeLists.txt index dfa788b313b..f061a7ea239 100644 --- a/tests/auto/wayland/inputcontext/CMakeLists.txt +++ b/tests/auto/wayland/inputcontext/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_inputcontext tst_inputcontext.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/iviapplication/.prev_CMakeLists.txt b/tests/auto/wayland/iviapplication/.prev_CMakeLists.txt index 4193ba9b07f..0453aad8190 100644 --- a/tests/auto/wayland/iviapplication/.prev_CMakeLists.txt +++ b/tests/auto/wayland/iviapplication/.prev_CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_iviapplication tst_iviapplication.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client Wayland::Server ) diff --git a/tests/auto/wayland/nooutput/.prev_CMakeLists.txt b/tests/auto/wayland/nooutput/.prev_CMakeLists.txt new file mode 100644 index 00000000000..3f09f584c21 --- /dev/null +++ b/tests/auto/wayland/nooutput/.prev_CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from nooutput.pro. + +##################################################################### +## tst_nooutput Test: +##################################################################### + +qt_add_test(tst_nooutput + SOURCES + ../shared/corecompositor.cpp ../shared/corecompositor.h + ../shared/coreprotocol.cpp ../shared/coreprotocol.h + ../shared/datadevice.cpp ../shared/datadevice.h + ../shared/mockcompositor.cpp ../shared/mockcompositor.h + ../shared/textinput.cpp ../shared/textinput.h + ../shared/xdgshell.cpp ../shared/xdgshell.h + tst_nooutput.cpp + INCLUDE_DIRECTORIES + ../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::OpenGL + Qt::WaylandClientPrivate + Wayland::Server +) + +qt6_generate_wayland_protocol_server_sources(tst_nooutput + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml +) diff --git a/tests/auto/wayland/nooutput/CMakeLists.txt b/tests/auto/wayland/nooutput/CMakeLists.txt new file mode 100644 index 00000000000..e5110c0c903 --- /dev/null +++ b/tests/auto/wayland/nooutput/CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from nooutput.pro. + +##################################################################### +## tst_nooutput Test: +##################################################################### + +qt_add_test(tst_nooutput + SOURCES + ../shared/corecompositor.cpp ../shared/corecompositor.h + ../shared/coreprotocol.cpp ../shared/coreprotocol.h + ../shared/datadevice.cpp ../shared/datadevice.h + ../shared/mockcompositor.cpp ../shared/mockcompositor.h + ../shared/textinput.cpp ../shared/textinput.h + ../shared/xdgshell.cpp ../shared/xdgshell.h + tst_nooutput.cpp + INCLUDE_DIRECTORIES + ../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::OpenGL + Qt::WaylandClientPrivate + Wayland::Server + Threads::Threads # special case +) + +qt6_generate_wayland_protocol_server_sources(tst_nooutput + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml +) diff --git a/tests/auto/wayland/output/.prev_CMakeLists.txt b/tests/auto/wayland/output/.prev_CMakeLists.txt index 8595888e955..09ca5d6d491 100644 --- a/tests/auto/wayland/output/.prev_CMakeLists.txt +++ b/tests/auto/wayland/output/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_output tst_output.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/output/CMakeLists.txt b/tests/auto/wayland/output/CMakeLists.txt index c453ac424f1..5d2dfbf9d54 100644 --- a/tests/auto/wayland/output/CMakeLists.txt +++ b/tests/auto/wayland/output/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_output tst_output.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/primaryselectionv1/.prev_CMakeLists.txt b/tests/auto/wayland/primaryselectionv1/.prev_CMakeLists.txt index 77a994dd4f9..f86e81e12ed 100644 --- a/tests/auto/wayland/primaryselectionv1/.prev_CMakeLists.txt +++ b/tests/auto/wayland/primaryselectionv1/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_primaryselectionv1 tst_primaryselectionv1.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/primaryselectionv1/CMakeLists.txt b/tests/auto/wayland/primaryselectionv1/CMakeLists.txt index af912234398..d101c8b3d97 100644 --- a/tests/auto/wayland/primaryselectionv1/CMakeLists.txt +++ b/tests/auto/wayland/primaryselectionv1/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_primaryselectionv1 tst_primaryselectionv1.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/seatv4/.prev_CMakeLists.txt b/tests/auto/wayland/seatv4/.prev_CMakeLists.txt index ab7eb380f04..9e0e4c37ebe 100644 --- a/tests/auto/wayland/seatv4/.prev_CMakeLists.txt +++ b/tests/auto/wayland/seatv4/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_seatv4 tst_seatv4.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) @@ -34,9 +33,7 @@ qt6_generate_wayland_protocol_server_sources(tst_seatv4 ##################################################################### qt_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate Wayland::Cursor ) diff --git a/tests/auto/wayland/seatv4/CMakeLists.txt b/tests/auto/wayland/seatv4/CMakeLists.txt index bd14a6a8bf6..36b0c847183 100644 --- a/tests/auto/wayland/seatv4/CMakeLists.txt +++ b/tests/auto/wayland/seatv4/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_seatv4 tst_seatv4.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) @@ -35,9 +34,7 @@ qt6_generate_wayland_protocol_server_sources(tst_seatv4 ##################################################################### qt_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate Wayland::Cursor ) diff --git a/tests/auto/wayland/seatv5/.prev_CMakeLists.txt b/tests/auto/wayland/seatv5/.prev_CMakeLists.txt index 778c42c0bf3..11d615fb2f7 100644 --- a/tests/auto/wayland/seatv5/.prev_CMakeLists.txt +++ b/tests/auto/wayland/seatv5/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_seatv5 tst_seatv5.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/seatv5/CMakeLists.txt b/tests/auto/wayland/seatv5/CMakeLists.txt index 38c5d980f53..fefdcf8dbe2 100644 --- a/tests/auto/wayland/seatv5/CMakeLists.txt +++ b/tests/auto/wayland/seatv5/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_seatv5 tst_seatv5.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/surface/.prev_CMakeLists.txt b/tests/auto/wayland/surface/.prev_CMakeLists.txt index bb728928614..43d6ec34e5a 100644 --- a/tests/auto/wayland/surface/.prev_CMakeLists.txt +++ b/tests/auto/wayland/surface/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_surface tst_surface.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/surface/CMakeLists.txt b/tests/auto/wayland/surface/CMakeLists.txt index 1470f414e60..a1545115e43 100644 --- a/tests/auto/wayland/surface/CMakeLists.txt +++ b/tests/auto/wayland/surface/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_surface tst_surface.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/tabletv2/.prev_CMakeLists.txt b/tests/auto/wayland/tabletv2/.prev_CMakeLists.txt new file mode 100644 index 00000000000..e7fc3f60f3a --- /dev/null +++ b/tests/auto/wayland/tabletv2/.prev_CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from tabletv2.pro. + +##################################################################### +## tst_tabletv2 Test: +##################################################################### + +qt_add_test(tst_tabletv2 + SOURCES + ../shared/corecompositor.cpp ../shared/corecompositor.h + ../shared/coreprotocol.cpp ../shared/coreprotocol.h + ../shared/datadevice.cpp ../shared/datadevice.h + ../shared/mockcompositor.cpp ../shared/mockcompositor.h + ../shared/textinput.cpp ../shared/textinput.h + ../shared/xdgshell.cpp ../shared/xdgshell.h + tst_tabletv2.cpp + INCLUDE_DIRECTORIES + ../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::OpenGL + Qt::WaylandClientPrivate + Wayland::Server +) + +qt6_generate_wayland_protocol_server_sources(tst_tabletv2 + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/tablet-unstable-v2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml +) diff --git a/tests/auto/wayland/tabletv2/CMakeLists.txt b/tests/auto/wayland/tabletv2/CMakeLists.txt new file mode 100644 index 00000000000..f5a12c55441 --- /dev/null +++ b/tests/auto/wayland/tabletv2/CMakeLists.txt @@ -0,0 +1,32 @@ +# Generated from tabletv2.pro. + +##################################################################### +## tst_tabletv2 Test: +##################################################################### + +qt_add_test(tst_tabletv2 + SOURCES + ../shared/corecompositor.cpp ../shared/corecompositor.h + ../shared/coreprotocol.cpp ../shared/coreprotocol.h + ../shared/datadevice.cpp ../shared/datadevice.h + ../shared/mockcompositor.cpp ../shared/mockcompositor.h + ../shared/textinput.cpp ../shared/textinput.h + ../shared/xdgshell.cpp ../shared/xdgshell.h + tst_tabletv2.cpp + INCLUDE_DIRECTORIES + ../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::OpenGL + Qt::WaylandClientPrivate + Wayland::Server + Threads::Threads # special case +) + +qt6_generate_wayland_protocol_server_sources(tst_tabletv2 + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/tablet-unstable-v2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml +) diff --git a/tests/auto/wayland/wl_connect/CMakeLists.txt b/tests/auto/wayland/wl_connect/CMakeLists.txt index 5ad3ac6a4a3..5a01bedd069 100644 --- a/tests/auto/wayland/wl_connect/CMakeLists.txt +++ b/tests/auto/wayland/wl_connect/CMakeLists.txt @@ -7,8 +7,7 @@ qt_add_test(tst_wlconnect SOURCES tst_wlconnect.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/wayland/xdgdecorationv1/.prev_CMakeLists.txt b/tests/auto/wayland/xdgdecorationv1/.prev_CMakeLists.txt index a73e1055c75..9311070a818 100644 --- a/tests/auto/wayland/xdgdecorationv1/.prev_CMakeLists.txt +++ b/tests/auto/wayland/xdgdecorationv1/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_xdgdecorationv1 tst_xdgdecorationv1.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/xdgdecorationv1/CMakeLists.txt b/tests/auto/wayland/xdgdecorationv1/CMakeLists.txt index 5d26b7fc865..de067a135c9 100644 --- a/tests/auto/wayland/xdgdecorationv1/CMakeLists.txt +++ b/tests/auto/wayland/xdgdecorationv1/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_xdgdecorationv1 tst_xdgdecorationv1.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/xdgoutput/.prev_CMakeLists.txt b/tests/auto/wayland/xdgoutput/.prev_CMakeLists.txt index 1a3afc1e292..505c7c0502f 100644 --- a/tests/auto/wayland/xdgoutput/.prev_CMakeLists.txt +++ b/tests/auto/wayland/xdgoutput/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_xdgoutput tst_xdgoutput.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/xdgoutput/CMakeLists.txt b/tests/auto/wayland/xdgoutput/CMakeLists.txt index 855268c9453..e0a4b756eca 100644 --- a/tests/auto/wayland/xdgoutput/CMakeLists.txt +++ b/tests/auto/wayland/xdgoutput/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_xdgoutput tst_xdgoutput.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/xdgshell/.prev_CMakeLists.txt b/tests/auto/wayland/xdgshell/.prev_CMakeLists.txt index 4dc670e9d91..65f76210771 100644 --- a/tests/auto/wayland/xdgshell/.prev_CMakeLists.txt +++ b/tests/auto/wayland/xdgshell/.prev_CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_xdgshell tst_xdgshell.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server ) diff --git a/tests/auto/wayland/xdgshell/CMakeLists.txt b/tests/auto/wayland/xdgshell/CMakeLists.txt index 025013e9f26..cab6c882550 100644 --- a/tests/auto/wayland/xdgshell/CMakeLists.txt +++ b/tests/auto/wayland/xdgshell/CMakeLists.txt @@ -15,11 +15,10 @@ qt_add_test(tst_xdgshell tst_xdgshell.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Server Threads::Threads # special case ) diff --git a/tests/auto/wayland/xdgshellv6/.prev_CMakeLists.txt b/tests/auto/wayland/xdgshellv6/.prev_CMakeLists.txt index ee3514f58a1..8fb87235bde 100644 --- a/tests/auto/wayland/xdgshellv6/.prev_CMakeLists.txt +++ b/tests/auto/wayland/xdgshellv6/.prev_CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_xdgshellv6 tst_xdgshellv6.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client Wayland::Server ) diff --git a/tests/auto/wayland/xdgshellv6/CMakeLists.txt b/tests/auto/wayland/xdgshellv6/CMakeLists.txt index fe358889906..03acb48150a 100644 --- a/tests/auto/wayland/xdgshellv6/CMakeLists.txt +++ b/tests/auto/wayland/xdgshellv6/CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_xdgshellv6 tst_xdgshellv6.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client Wayland::Server Threads::Threads # special case