1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Regenerate and adjust projects after merge

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2020-03-24 16:23:53 +01:00
parent b27b0ac173
commit 6f9b27769f
52 changed files with 334 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/platforms/wayland/.prev_CMakeLists.txt
View File

@ -40,6 +40,7 @@ qt_add_module(WaylandClient
qwaylandshmwindow.cpp qwaylandshmwindow_p.h qwaylandshmwindow.cpp qwaylandshmwindow_p.h
qwaylandsubsurface.cpp qwaylandsubsurface_p.h qwaylandsubsurface.cpp qwaylandsubsurface_p.h
qwaylandsurface.cpp qwaylandsurface_p.h qwaylandsurface.cpp qwaylandsurface_p.h
qwaylandtabletv2.cpp qwaylandtabletv2_p.h
qwaylandtouch.cpp qwaylandtouch_p.h qwaylandtouch.cpp qwaylandtouch_p.h
qwaylandwindow.cpp qwaylandwindow_p.h qwaylandwindow.cpp qwaylandwindow_p.h
qwaylandwindowmanagerintegration.cpp qwaylandwindowmanagerintegration_p.h qwaylandwindowmanagerintegration.cpp qwaylandwindowmanagerintegration_p.h
@ -63,10 +64,14 @@ qt_add_module(WaylandClient
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Wayland::Client Wayland::Client
PRIVATE_MODULE_INTERFACE
Qt::CorePrivate
Qt::GuiPrivate
) )
qt6_generate_wayland_protocol_client_sources(WaylandClient qt6_generate_wayland_protocol_client_sources(WaylandClient
FILES 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/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wp-primary-selection-unstable-v1.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::XkbCommonSupportPrivate
) )
qt_extend_target(WaylandClient CONDITION TARGET linuxaccessibility_support_private qt_extend_target(WaylandClient CONDITION TARGET Qt::PlatformCompositorSupportPrivate
LIBRARIES 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 qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard

17
src/plugins/platforms/wayland/CMakeLists.txt
View File

@ -40,6 +40,7 @@ qt_add_module(WaylandClient
qwaylandshmwindow.cpp qwaylandshmwindow_p.h qwaylandshmwindow.cpp qwaylandshmwindow_p.h
qwaylandsubsurface.cpp qwaylandsubsurface_p.h qwaylandsubsurface.cpp qwaylandsubsurface_p.h
qwaylandsurface.cpp qwaylandsurface_p.h qwaylandsurface.cpp qwaylandsurface_p.h
qwaylandtabletv2.cpp qwaylandtabletv2_p.h
qwaylandtouch.cpp qwaylandtouch_p.h qwaylandtouch.cpp qwaylandtouch_p.h
qwaylandwindow.cpp qwaylandwindow_p.h qwaylandwindow.cpp qwaylandwindow_p.h
qwaylandwindowmanagerintegration.cpp qwaylandwindowmanagerintegration_p.h qwaylandwindowmanagerintegration.cpp qwaylandwindowmanagerintegration_p.h
@ -63,10 +64,15 @@ qt_add_module(WaylandClient
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Wayland::Client Wayland::Client
PRIVATE_MODULE_INTERFACE
Qt::CorePrivate
Qt::GuiPrivate
Qt::ServiceSupportPrivate # special case QTBUG-83063
) )
qt6_generate_wayland_protocol_client_sources(WaylandClient qt6_generate_wayland_protocol_client_sources(WaylandClient
FILES 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/text-input-unstable-v2.xml
${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml
${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wp-primary-selection-unstable-v1.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 qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
LIBRARIES LIBRARIES
Qt::XkbCommonSupportPrivate 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 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 qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard

10
src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt
View File

@ -1,20 +1,18 @@
# Generated from bradient.pro. # Generated from bradient.pro.
##################################################################### #####################################################################
## bradient Plugin: ## QWaylandBradientDecorationPlugin Plugin:
##################################################################### #####################################################################
qt_add_plugin(bradient qt_add_plugin(QWaylandBradientDecorationPlugin
OUTPUT_NAME bradient
TYPE wayland-decoration-client TYPE wayland-decoration-client
CLASS_NAME QWaylandBradientDecorationPlugin
SOURCES SOURCES
main.cpp main.cpp
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )

15
src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/CMakeLists.txt
View File

@ -1,12 +1,12 @@
# Generated from brcm-egl.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME QWaylandBrcmEglClientBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
@ -14,20 +14,17 @@ qt_add_plugin(brcm-egl
main.cpp main.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/brcm-egl ../../../../hardwareintegration/client/brcm-egl
LIBRARIES
Qt::EglSupportPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
EGL::EGL EGL::EGL
Qt::Core Qt::Core
Qt::EglSupport Qt::EglSupportPrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(brcm-egl qt6_generate_wayland_protocol_client_sources(QWaylandBrcmEglClientBufferPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/brcm-egl/../../../extensions/brcm.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/brcm-egl/../../../extensions/brcm.xml
) )

13
src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/CMakeLists.txt
View File

@ -1,28 +1,27 @@
# Generated from dmabuf-server.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME DmaBufServerBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h
main.cpp main.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/dmabuf-server ../../../../hardwareintegration/client/dmabuf-server
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
EGL::EGL EGL::EGL
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(dmabuf-server qt6_generate_wayland_protocol_client_sources(DmaBufServerBufferPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/dmabuf-server/../../../extensions/qt-dmabuf-server-buffer.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/dmabuf-server/../../../extensions/qt-dmabuf-server-buffer.xml
) )

13
src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/CMakeLists.txt
View File

@ -1,28 +1,27 @@
# Generated from drm-egl-server.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME DrmEglServerBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
main.cpp main.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/drm-egl-server ../../../../hardwareintegration/client/drm-egl-server
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
EGL::EGL EGL::EGL
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(drm-egl-server qt6_generate_wayland_protocol_client_sources(DrmEglServerBufferPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/drm-egl-server/../../../extensions/drm-egl-server-buffer.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/drm-egl-server/../../../extensions/drm-egl-server-buffer.xml
) )

12
src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/CMakeLists.txt
View File

@ -1,28 +1,26 @@
# Generated from libhybris-egl-server.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME LibHybrisEglServerBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h
main.cpp main.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/libhybris-egl-server ../../../../hardwareintegration/client/libhybris-egl-server
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
EGL::EGL EGL::EGL
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(libhybris-egl-server qt6_generate_wayland_protocol_client_sources(LibHybrisEglServerBufferPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/libhybris-egl-server/../../../extensions/libhybris-egl-server-buffer.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/libhybris-egl-server/../../../extensions/libhybris-egl-server-buffer.xml
) )

13
src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/CMakeLists.txt
View File

@ -1,27 +1,26 @@
# Generated from shm-emulation-server.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME ShmServerBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h
main.cpp main.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/shm-emulation-server ../../../../hardwareintegration/client/shm-emulation-server
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(shm-emulation-server qt6_generate_wayland_protocol_client_sources(ShmServerBufferPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/shm-emulation-server/../../../extensions/shm-emulation-server-buffer.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/shm-emulation-server/../../../extensions/shm-emulation-server-buffer.xml
) )

13
src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/CMakeLists.txt
View File

@ -1,27 +1,26 @@
# Generated from vulkan-server.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME VulkanServerBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h
main.cpp main.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/vulkan-server ../../../../hardwareintegration/client/vulkan-server
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(vulkan-server qt6_generate_wayland_protocol_client_sources(VulkanServerBufferPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/vulkan-server/../../../extensions/qt-vulkan-server-buffer-unstable-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/vulkan-server/../../../extensions/qt-vulkan-server-buffer-unstable-v1.xml
) )

14
src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt
View File

@ -1,12 +1,12 @@
# Generated from wayland-egl.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME QWaylandEglClientBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
../../../../hardwareintegration/client/wayland-egl/qwaylandeglinclude.h ../../../../hardwareintegration/client/wayland-egl/qwaylandeglinclude.h
@ -15,15 +15,13 @@ qt_add_plugin(qt-plugin-wayland-egl
main.cpp main.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/wayland-egl ../../../../hardwareintegration/client/wayland-egl
LIBRARIES
Qt::EglSupportPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
EGL::EGL EGL::EGL
Qt::Core Qt::Core
Qt::EglSupport Qt::EglSupportPrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGLPrivate
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
Wayland::Egl Wayland::Egl
) )

15
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/CMakeLists.txt
View File

@ -1,12 +1,12 @@
# Generated from xcomposite-egl.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME QWaylandXCompositeEglClientBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
@ -16,21 +16,18 @@ qt_add_plugin(xcomposite-egl
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/xcomposite-egl ../../../../hardwareintegration/client/xcomposite-egl
../../../../hardwareintegration/client/xcomposite_share ../../../../hardwareintegration/client/xcomposite_share
LIBRARIES
Qt::EglSupportPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
EGL::EGL EGL::EGL
PkgConfig::XComposite PkgConfig::XComposite
Qt::Core Qt::Core
Qt::EglSupport Qt::EglSupportPrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
X11::X11 X11::X11
) )
qt6_generate_wayland_protocol_client_sources(xcomposite-egl qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeEglClientBufferPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml
) )

15
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/CMakeLists.txt
View File

@ -1,12 +1,12 @@
# Generated from xcomposite-glx.pro. # 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 TYPE wayland-graphics-integration-client
CLASS_NAME QWaylandXCompositeGlxClientBufferPlugin
SOURCES SOURCES
../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
@ -16,21 +16,18 @@ qt_add_plugin(xcomposite-glx
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../hardwareintegration/client/xcomposite-glx ../../../../hardwareintegration/client/xcomposite-glx
../../../../hardwareintegration/client/xcomposite_share ../../../../hardwareintegration/client/xcomposite_share
LIBRARIES
Qt::GlxSupportPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
PkgConfig::XComposite PkgConfig::XComposite
Qt::Core Qt::Core
Qt::GlxSupport Qt::GlxSupportPrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
X11::X11 X11::X11
) )
qt6_generate_wayland_protocol_client_sources(xcomposite-glx qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeGlxClientBufferPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml
) )

14
src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt
View File

@ -1,27 +1,25 @@
# Generated from fullscreen-shell-v1.pro. # 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 TYPE wayland-shell-integration
CLASS_NAME QWaylandFullScreenShellV1IntegrationPlugin
SOURCES SOURCES
main.cpp main.cpp
qwaylandfullscreenshellv1integration.cpp qwaylandfullscreenshellv1integration.h qwaylandfullscreenshellv1integration.cpp qwaylandfullscreenshellv1integration.h
qwaylandfullscreenshellv1surface.cpp qwaylandfullscreenshellv1surface.h qwaylandfullscreenshellv1surface.cpp qwaylandfullscreenshellv1surface.h
LIBRARIES
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(fullscreen-shell-v1 qt6_generate_wayland_protocol_client_sources(QWaylandFullScreenShellV1IntegrationPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/fullscreen-shell-unstable-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/fullscreen-shell-unstable-v1.xml
) )

16
src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt
View File

@ -1,27 +1,25 @@
# Generated from wl-shell.pro. # 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 TYPE wayland-shell-integration
CLASS_NAME QWaylandWlShellIntegrationPlugin
SOURCES SOURCES
main.cpp main.cpp
qwaylandwlshellintegration.cpp qwaylandwlshellintegration_p.h qwaylandwlshellintegration.cpp qwaylandwlshellintegration_p.h
qwaylandwlshellsurface.cpp qwaylandwlshellsurface_p.h qwaylandwlshellsurface.cpp qwaylandwlshellsurface_p.h
LIBRARIES
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(wl-shell qt6_generate_wayland_protocol_client_sources(QWaylandWlShellIntegrationPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland.xml
) )
@ -32,7 +30,7 @@ qt6_generate_wayland_protocol_client_sources(wl-shell
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(wl-shell CONDITION QT_FEATURE_xkbcommon qt_extend_target(QWaylandWlShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
LIBRARIES LIBRARIES
XKB::XKB XKB::XKB
) )

14
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt
View File

@ -1,12 +1,12 @@
# Generated from xdg-shell-v5.pro. # 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 TYPE wayland-shell-integration
CLASS_NAME QWaylandXdgShellV5IntegrationPlugin
SOURCES SOURCES
main.cpp main.cpp
pregenerated/3rdparty/qwayland-xdg-shell-unstable-v5.cpp pregenerated/3rdparty/qwayland-xdg-shell-unstable-v5_p.h 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 qwaylandxdgsurfacev5.cpp qwaylandxdgsurfacev5_p.h
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
pregenerated/3rdparty pregenerated/3rdparty
LIBRARIES
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
@ -34,7 +32,7 @@ qt_add_plugin(xdg-shell-v5
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(xdg-shell-v5 CONDITION QT_FEATURE_xkbcommon qt_extend_target(QWaylandXdgShellV5IntegrationPlugin CONDITION QT_FEATURE_xkbcommon
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
XKB::XKB XKB::XKB
) )

16
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt
View File

@ -1,27 +1,25 @@
# Generated from xdg-shell-v6.pro. # 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 TYPE wayland-shell-integration
CLASS_NAME QWaylandXdgShellV6IntegrationPlugin
SOURCES SOURCES
main.cpp main.cpp
qwaylandxdgshellv6.cpp qwaylandxdgshellv6_p.h qwaylandxdgshellv6.cpp qwaylandxdgshellv6_p.h
qwaylandxdgshellv6integration.cpp qwaylandxdgshellv6integration_p.h qwaylandxdgshellv6integration.cpp qwaylandxdgshellv6integration_p.h
LIBRARIES
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(xdg-shell-v6 qt6_generate_wayland_protocol_client_sources(QWaylandXdgShellV6IntegrationPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-shell-unstable-v6.xml ${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: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(xdg-shell-v6 CONDITION QT_FEATURE_xkbcommon qt_extend_target(QWaylandXdgShellV6IntegrationPlugin CONDITION QT_FEATURE_xkbcommon
LIBRARIES LIBRARIES
XKB::XKB XKB::XKB
) )

16
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt
View File

@ -1,28 +1,26 @@
# Generated from xdg-shell.pro. # 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 TYPE wayland-shell-integration
CLASS_NAME QWaylandXdgShellIntegrationPlugin
SOURCES SOURCES
main.cpp main.cpp
qwaylandxdgdecorationv1.cpp qwaylandxdgdecorationv1_p.h qwaylandxdgdecorationv1.cpp qwaylandxdgdecorationv1_p.h
qwaylandxdgshell.cpp qwaylandxdgshell_p.h qwaylandxdgshell.cpp qwaylandxdgshell_p.h
qwaylandxdgshellintegration.cpp qwaylandxdgshellintegration_p.h qwaylandxdgshellintegration.cpp qwaylandxdgshellintegration_p.h
LIBRARIES
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
) )
qt6_generate_wayland_protocol_client_sources(xdg-shell qt6_generate_wayland_protocol_client_sources(QWaylandXdgShellIntegrationPlugin
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-shell.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-shell.xml
@ -34,7 +32,7 @@ qt6_generate_wayland_protocol_client_sources(xdg-shell
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(xdg-shell CONDITION QT_FEATURE_xkbcommon qt_extend_target(QWaylandXdgShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
LIBRARIES LIBRARIES
XKB::XKB XKB::XKB
) )

15
src/tools/qtwaylandscanner/.prev_CMakeLists.txt Normal file
View File

@ -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:<TRUE>:
# _OPTION = "host_build"

6
src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake
View File

@ -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... # 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 # unfortunately, it's not going to work outside QtWayland because we're using waylandclient-private includes
set(qtwaylandscanner_code_include "") 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) if ("${target}" IN_LIST targets_that_need_include OR is_for_module)
set(qtwaylandscanner_code_include "<QtWaylandClient/private/wayland-wayland-client-protocol.h>") set(qtwaylandscanner_code_include "<QtWaylandClient/private/wayland-wayland-client-protocol.h>")
endif() endif()

2
tests/auto/wayland/CMakeLists.txt
View File

@ -4,11 +4,13 @@ add_subdirectory(client)
add_subdirectory(datadevicev1) add_subdirectory(datadevicev1)
add_subdirectory(fullscreenshellv1) add_subdirectory(fullscreenshellv1)
add_subdirectory(iviapplication) add_subdirectory(iviapplication)
add_subdirectory(nooutput)
add_subdirectory(output) add_subdirectory(output)
add_subdirectory(primaryselectionv1) add_subdirectory(primaryselectionv1)
add_subdirectory(seatv4) add_subdirectory(seatv4)
add_subdirectory(seatv5) add_subdirectory(seatv5)
add_subdirectory(surface) add_subdirectory(surface)
add_subdirectory(tabletv2)
add_subdirectory(wl_connect) add_subdirectory(wl_connect)
add_subdirectory(xdgdecorationv1) add_subdirectory(xdgdecorationv1)
add_subdirectory(xdgoutput) add_subdirectory(xdgoutput)

9
tests/auto/wayland/client/.prev_CMakeLists.txt
View File

@ -17,13 +17,12 @@ qt_add_test(tst_client
tst_client.cpp tst_client.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared_old ../shared_old
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
Wayland::Server Wayland::Server
) )

9
tests/auto/wayland/client/CMakeLists.txt
View File

@ -17,13 +17,12 @@ qt_add_test(tst_client
tst_client.cpp tst_client.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared_old ../shared_old
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case

5
tests/auto/wayland/datadevicev1/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_datadevicev1
tst_datadevicev1.cpp tst_datadevicev1.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/datadevicev1/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_datadevicev1
tst_datadevicev1.cpp tst_datadevicev1.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

9
tests/auto/wayland/fullscreenshellv1/.prev_CMakeLists.txt
View File

@ -17,13 +17,12 @@ qt_add_test(tst_client_fullscreenshellv1
tst_fullscreenshellv1.cpp tst_fullscreenshellv1.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared_old ../shared_old
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
Wayland::Server Wayland::Server
) )

9
tests/auto/wayland/fullscreenshellv1/CMakeLists.txt
View File

@ -17,13 +17,12 @@ qt_add_test(tst_client_fullscreenshellv1
tst_fullscreenshellv1.cpp tst_fullscreenshellv1.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared_old ../shared_old
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case

5
tests/auto/wayland/inputcontext/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_inputcontext
tst_inputcontext.cpp tst_inputcontext.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/inputcontext/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_inputcontext
tst_inputcontext.cpp tst_inputcontext.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

9
tests/auto/wayland/iviapplication/.prev_CMakeLists.txt
View File

@ -17,13 +17,12 @@ qt_add_test(tst_client_iviapplication
tst_iviapplication.cpp tst_iviapplication.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared_old ../shared_old
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
Wayland::Server Wayland::Server
) )

30
tests/auto/wayland/nooutput/.prev_CMakeLists.txt Normal file
View File

@ -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
)

31
tests/auto/wayland/nooutput/CMakeLists.txt Normal file
View File

@ -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
)

5
tests/auto/wayland/output/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_output
tst_output.cpp tst_output.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/output/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_output
tst_output.cpp tst_output.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

5
tests/auto/wayland/primaryselectionv1/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_primaryselectionv1
tst_primaryselectionv1.cpp tst_primaryselectionv1.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/primaryselectionv1/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_primaryselectionv1
tst_primaryselectionv1.cpp tst_primaryselectionv1.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

9
tests/auto/wayland/seatv4/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_seatv4
tst_seatv4.cpp tst_seatv4.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )
@ -34,9 +33,7 @@ qt6_generate_wayland_protocol_server_sources(tst_seatv4
##################################################################### #####################################################################
qt_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor qt_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::GuiPrivate
Wayland::Cursor Wayland::Cursor
) )

9
tests/auto/wayland/seatv4/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_seatv4
tst_seatv4.cpp tst_seatv4.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case 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 qt_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::GuiPrivate
Wayland::Cursor Wayland::Cursor
) )

5
tests/auto/wayland/seatv5/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_seatv5
tst_seatv5.cpp tst_seatv5.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/seatv5/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_seatv5
tst_seatv5.cpp tst_seatv5.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

5
tests/auto/wayland/surface/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_surface
tst_surface.cpp tst_surface.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/surface/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_surface
tst_surface.cpp tst_surface.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

31
tests/auto/wayland/tabletv2/.prev_CMakeLists.txt Normal file
View File

@ -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
)

32
tests/auto/wayland/tabletv2/CMakeLists.txt Normal file
View File

@ -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
)

3
tests/auto/wayland/wl_connect/CMakeLists.txt
View File

@ -7,8 +7,7 @@
qt_add_test(tst_wlconnect qt_add_test(tst_wlconnect
SOURCES SOURCES
tst_wlconnect.cpp tst_wlconnect.cpp
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

5
tests/auto/wayland/xdgdecorationv1/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_xdgdecorationv1
tst_xdgdecorationv1.cpp tst_xdgdecorationv1.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/xdgdecorationv1/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_xdgdecorationv1
tst_xdgdecorationv1.cpp tst_xdgdecorationv1.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

5
tests/auto/wayland/xdgoutput/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_xdgoutput
tst_xdgoutput.cpp tst_xdgoutput.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/xdgoutput/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_xdgoutput
tst_xdgoutput.cpp tst_xdgoutput.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

5
tests/auto/wayland/xdgshell/.prev_CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_xdgshell
tst_xdgshell.cpp tst_xdgshell.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
) )

5
tests/auto/wayland/xdgshell/CMakeLists.txt
View File

@ -15,11 +15,10 @@ qt_add_test(tst_xdgshell
tst_xdgshell.cpp tst_xdgshell.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared ../shared
LIBRARIES
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case
) )

9
tests/auto/wayland/xdgshellv6/.prev_CMakeLists.txt
View File

@ -17,13 +17,12 @@ qt_add_test(tst_client_xdgshellv6
tst_xdgshellv6.cpp tst_xdgshellv6.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared_old ../shared_old
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
Wayland::Server Wayland::Server
) )

9
tests/auto/wayland/xdgshellv6/CMakeLists.txt
View File

@ -17,13 +17,12 @@ qt_add_test(tst_client_xdgshellv6
tst_xdgshellv6.cpp tst_xdgshellv6.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../shared_old ../shared_old
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::WaylandClientPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::WaylandClient Qt::GuiPrivate
Qt::OpenGL
Qt::WaylandClientPrivate
Wayland::Client Wayland::Client
Wayland::Server Wayland::Server
Threads::Threads # special case Threads::Threads # special case