diff options
98 files changed, 773 insertions, 484 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt index 5a2b960d9..5dbeedd2a 100644 --- a/.prev_CMakeLists.txt +++ b/.prev_CMakeLists.txt @@ -12,8 +12,8 @@ project(wayland_FIXME find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) -if(NOT APPLE_OSX AND (ANDROID OR NOT LINUX)) - message(NOTICE "Skipping the build as the condition \"APPLE_OSX OR LINUX\" is not met.") +if(NOT MACOS AND NOT QNX AND (ANDROID OR NOT LINUX)) + message(NOTICE "Skipping the build as the condition \"LINUX OR MACOS OR QNX\" is not met.") return() endif() if(NOT TARGET Qt::Gui) diff --git a/CMakeLists.txt b/CMakeLists.txt index a96c05ac8..3a28f3164 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS EglSupport GlxSupport LinuxAccessibilitySupport + PlatformCompositorSupport Quick ServiceSupport VulkanSupport @@ -33,8 +34,8 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS ) # special case end -if(NOT APPLE_OSX AND (ANDROID OR NOT LINUX)) - message(NOTICE "Skipping the build as the condition \"APPLE_OSX OR LINUX\" is not met.") +if(NOT MACOS AND NOT QNX AND (ANDROID OR NOT LINUX)) + message(NOTICE "Skipping the build as the condition \"LINUX OR MACOS OR QNX\" is not met.") return() endif() if(NOT TARGET Qt::Gui) diff --git a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt index 8f3708a19..ffdc34b70 100644 --- a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt +++ b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt @@ -24,13 +24,10 @@ qt6_generate_wayland_protocol_client_sources(custom-extension-cpp-client FILES ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml ) -target_link_libraries(custom-extension-cpp-client PRIVATE - Qt::GuiPrivate -) - target_link_libraries(custom-extension-cpp-client PUBLIC Qt::Core Qt::Gui + Qt::GuiPrivate Qt::WaylandClient ) diff --git a/examples/wayland/custom-extension/qml-client/CMakeLists.txt b/examples/wayland/custom-extension/qml-client/CMakeLists.txt index f490b507d..9ce56593b 100644 --- a/examples/wayland/custom-extension/qml-client/CMakeLists.txt +++ b/examples/wayland/custom-extension/qml-client/CMakeLists.txt @@ -26,13 +26,10 @@ qt6_generate_wayland_protocol_client_sources(custom-extension-qml-client FILES ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml ) -target_link_libraries(custom-extension-qml-client PRIVATE - Qt::GuiPrivate -) - target_link_libraries(custom-extension-qml-client PUBLIC Qt::Core Qt::Gui + Qt::GuiPrivate Qt::Qml Qt::Quick Qt::WaylandClient diff --git a/examples/wayland/server-buffer/compositor/CMakeLists.txt b/examples/wayland/server-buffer/compositor/CMakeLists.txt index dc47cfe0c..932f4be08 100644 --- a/examples/wayland/server-buffer/compositor/CMakeLists.txt +++ b/examples/wayland/server-buffer/compositor/CMakeLists.txt @@ -25,15 +25,11 @@ qt6_generate_wayland_protocol_server_sources(compositor FILES ${CMAKE_CURRENT_SOURCE_DIR}/../share-buffer.xml ) -target_link_libraries(compositor PRIVATE - Qt::WaylandCompositorPrivate -) - target_link_libraries(compositor PUBLIC Qt::Core Qt::Gui Qt::Qml - Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) diff --git a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt b/examples/wayland/server-buffer/cpp-client/CMakeLists.txt index 5b4c1e95c..2f33057fe 100644 --- a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt +++ b/examples/wayland/server-buffer/cpp-client/CMakeLists.txt @@ -14,6 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples/wayland/server-buffer/cpp-client") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS WaylandClient) +find_package(Qt6 COMPONENTS OpenGL) add_qt_gui_executable(server-buffer-cpp-client main.cpp @@ -24,15 +25,12 @@ qt6_generate_wayland_protocol_client_sources(server-buffer-cpp-client FILES ${CMAKE_CURRENT_SOURCE_DIR}/../share-buffer.xml ) -target_link_libraries(server-buffer-cpp-client PRIVATE - Qt::GuiPrivate - Qt::WaylandClientPrivate -) - target_link_libraries(server-buffer-cpp-client PUBLIC Qt::Core Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::OpenGL + Qt::WaylandClientPrivate ) install(TARGETS server-buffer-cpp-client diff --git a/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt b/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt index ea56f9c3f..a6127f584 100644 --- a/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt +++ b/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt @@ -19,15 +19,11 @@ find_package(Qt6 COMPONENTS WaylandCompositor) add_qt_gui_executable(texture-sharing-custom-compositor main.cpp ) -target_link_libraries(texture-sharing-custom-compositor PRIVATE - Qt::WaylandCompositorPrivate -) - target_link_libraries(texture-sharing-custom-compositor PUBLIC Qt::Core Qt::Gui Qt::Qml - Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt index c55baa556..5fb1675ca 100644 --- a/src/.prev_CMakeLists.txt +++ b/src/.prev_CMakeLists.txt @@ -1,2 +1,13 @@ # Generated from src.pro. +if(QT_FEATURE_wayland_client OR QT_FEATURE_wayland_server) + add_subdirectory(qtwaylandscanner) + add_subdirectory(plugins) + add_subdirectory(imports) +endif() +if(QT_FEATURE_wayland_client) + add_subdirectory(client) +endif() +if(QT_FEATURE_wayland_server) + add_subdirectory(compositor) +endif() diff --git a/src/client/.prev_CMakeLists.txt b/src/client/.prev_CMakeLists.txt index 274cf70d6..58861b945 100644 --- a/src/client/.prev_CMakeLists.txt +++ b/src/client/.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 + Qt::PlatformCompositorSupportPrivate +) + +qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate LIBRARIES - linuxaccessibility_support_private + Qt::LinuxAccessibilitySupportPrivate ) qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 133865179..248f72136 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/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::PlatformCompositorSupportPrivate + LIBRARIES + Qt::PlatformCompositorSupportPrivate ) -qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate # special case +qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate LIBRARIES - Qt::LinuxAccessibilitySupportPrivate # special case + Qt::LinuxAccessibilitySupportPrivate ) qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard diff --git a/src/client/Qt6WaylandClientMacros.cmake b/src/client/Qt6WaylandClientMacros.cmake index 83e557ffd..6624c84f2 100644 --- a/src/client/Qt6WaylandClientMacros.cmake +++ b/src/client/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 "<QtWaylandClient/private/wayland-wayland-client-protocol.h>") endif() diff --git a/src/compositor/.prev_CMakeLists.txt b/src/compositor/.prev_CMakeLists.txt new file mode 100644 index 000000000..35bae5ef0 --- /dev/null +++ b/src/compositor/.prev_CMakeLists.txt @@ -0,0 +1,216 @@ +# Generated from compositor.pro. + +##################################################################### +## WaylandCompositor Module: +##################################################################### + +qt_add_module(WaylandCompositor + PLUGIN_TYPES wayland-graphics-integration-server wayland-hardware-layer-integration + SOURCES + ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h + ../shared/qwaylandmimehelper.cpp ../shared/qwaylandmimehelper_p.h + ../shared/qwaylandsharedmemoryformathelper_p.h + compositor_api/qwaylandbufferref.cpp compositor_api/qwaylandbufferref.h + compositor_api/qwaylandclient.cpp compositor_api/qwaylandclient.h + compositor_api/qwaylandcompositor.cpp compositor_api/qwaylandcompositor.h compositor_api/qwaylandcompositor_p.h + compositor_api/qwaylanddestroylistener.cpp compositor_api/qwaylanddestroylistener.h compositor_api/qwaylanddestroylistener_p.h + compositor_api/qwaylandkeyboard.cpp compositor_api/qwaylandkeyboard.h compositor_api/qwaylandkeyboard_p.h + compositor_api/qwaylandkeymap.cpp compositor_api/qwaylandkeymap.h compositor_api/qwaylandkeymap_p.h + compositor_api/qwaylandoutput.cpp compositor_api/qwaylandoutput.h compositor_api/qwaylandoutput_p.h + compositor_api/qwaylandoutputmode.cpp compositor_api/qwaylandoutputmode.h compositor_api/qwaylandoutputmode_p.h + compositor_api/qwaylandpointer.cpp compositor_api/qwaylandpointer.h compositor_api/qwaylandpointer_p.h + compositor_api/qwaylandquickchildren.h + compositor_api/qwaylandresource.cpp compositor_api/qwaylandresource.h + compositor_api/qwaylandseat.cpp compositor_api/qwaylandseat.h compositor_api/qwaylandseat_p.h + compositor_api/qwaylandsurface.cpp compositor_api/qwaylandsurface.h compositor_api/qwaylandsurface_p.h + compositor_api/qwaylandsurfacegrabber.cpp compositor_api/qwaylandsurfacegrabber.h + compositor_api/qwaylandtouch.cpp compositor_api/qwaylandtouch.h compositor_api/qwaylandtouch_p.h + compositor_api/qwaylandview.cpp compositor_api/qwaylandview.h compositor_api/qwaylandview_p.h + extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5.cpp extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h + extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-protocol.c + extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-server-protocol_p.h + extensions/qwaylandidleinhibitv1.cpp extensions/qwaylandidleinhibitv1.h extensions/qwaylandidleinhibitv1_p.h + extensions/qwaylandiviapplication.cpp extensions/qwaylandiviapplication.h extensions/qwaylandiviapplication_p.h + extensions/qwaylandivisurface.cpp extensions/qwaylandivisurface.h extensions/qwaylandivisurface_p.h + extensions/qwaylandqtwindowmanager.cpp extensions/qwaylandqtwindowmanager.h extensions/qwaylandqtwindowmanager_p.h + extensions/qwaylandshell.cpp extensions/qwaylandshell.h extensions/qwaylandshell_p.h + extensions/qwaylandshellsurface.cpp extensions/qwaylandshellsurface.h + extensions/qwaylandtextinput.cpp extensions/qwaylandtextinput.h extensions/qwaylandtextinput_p.h + extensions/qwaylandtextinputmanager.cpp extensions/qwaylandtextinputmanager.h extensions/qwaylandtextinputmanager_p.h + extensions/qwaylandviewporter.cpp extensions/qwaylandviewporter.h extensions/qwaylandviewporter_p.h + extensions/qwaylandwlscaler.cpp extensions/qwaylandwlscaler.h extensions/qwaylandwlscaler_p.h + extensions/qwaylandwlshell.cpp extensions/qwaylandwlshell.h extensions/qwaylandwlshell_p.h + extensions/qwaylandxdgdecorationv1.cpp extensions/qwaylandxdgdecorationv1.h extensions/qwaylandxdgdecorationv1_p.h + extensions/qwaylandxdgoutputv1.cpp extensions/qwaylandxdgoutputv1.h extensions/qwaylandxdgoutputv1_p.h + extensions/qwaylandxdgshell.cpp extensions/qwaylandxdgshell.h extensions/qwaylandxdgshell_p.h + extensions/qwaylandxdgshellv5.cpp extensions/qwaylandxdgshellv5.h extensions/qwaylandxdgshellv5_p.h + extensions/qwaylandxdgshellv6.cpp extensions/qwaylandxdgshellv6.h extensions/qwaylandxdgshellv6_p.h + extensions/qwlqtkey.cpp extensions/qwlqtkey_p.h + extensions/qwlqttouch.cpp extensions/qwlqttouch_p.h + global/qtwaylandcompositorglobal.h + global/qwaylandcompositorextension.cpp global/qwaylandcompositorextension.h global/qwaylandcompositorextension_p.h + global/qwaylandquickextension.h + global/qwaylandutils_p.h + wayland_wrapper/qwlbuffermanager.cpp wayland_wrapper/qwlbuffermanager_p.h + wayland_wrapper/qwlclientbuffer.cpp wayland_wrapper/qwlclientbuffer_p.h + wayland_wrapper/qwlregion.cpp wayland_wrapper/qwlregion_p.h + INCLUDE_DIRECTORIES + ../shared + compositor_api + extensions + global + wayland_wrapper + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Wayland::Server + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate +) + +# Resources: +set(compositor_resource_files + "shaders/surface.vert" + "shaders/surface_oes_external.frag" + "shaders/surface_rgba.frag" + "shaders/surface_rgbx.frag" + "shaders/surface_y_u_v.frag" + "shaders/surface_y_uv.frag" + "shaders/surface_y_xuxv.frag" +) + +qt_add_resource(WaylandCompositor "compositor" + PREFIX + "/qt-project.org/wayland/compositor" + FILES + ${compositor_resource_files} +) + + +qt6_generate_wayland_protocol_server_sources(WaylandCompositor + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/idle-inhibit-unstable-v1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/ivi-application.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/scaler.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/viewporter.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-decoration-unstable-v1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-output-unstable-v1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-shell.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-shell-unstable-v6.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-key-unstable-v1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-windowmanager.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/touch-extension.xml +) + +#### Keys ignored in scope 1:.:.:compositor.pro:<TRUE>: +# MODULE = "waylandcompositor" + +## Scopes: +##################################################################### + +if(QT_FEATURE_opengl) + + qt6_generate_wayland_protocol_server_sources(WaylandCompositor + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/hardware-integration.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/server-buffer-extension.xml + ) + +endif() + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl + SOURCES + hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h + hardware_integration/qwlclientbufferintegrationfactory.cpp hardware_integration/qwlclientbufferintegrationfactory_p.h + hardware_integration/qwlclientbufferintegrationplugin.cpp hardware_integration/qwlclientbufferintegrationplugin_p.h + hardware_integration/qwlhardwarelayerintegration.cpp hardware_integration/qwlhardwarelayerintegration_p.h + hardware_integration/qwlhardwarelayerintegrationfactory.cpp hardware_integration/qwlhardwarelayerintegrationfactory_p.h + hardware_integration/qwlhardwarelayerintegrationplugin.cpp hardware_integration/qwlhardwarelayerintegrationplugin_p.h + hardware_integration/qwlhwintegration.cpp hardware_integration/qwlhwintegration_p.h + hardware_integration/qwlserverbufferintegration.cpp hardware_integration/qwlserverbufferintegration_p.h + hardware_integration/qwlserverbufferintegrationfactory.cpp hardware_integration/qwlserverbufferintegrationfactory_p.h + hardware_integration/qwlserverbufferintegrationplugin.cpp hardware_integration/qwlserverbufferintegrationplugin_p.h + PUBLIC_LIBRARIES + Qt::OpenGL +) + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon + LIBRARIES + Qt::XkbCommonSupportPrivate + PUBLIC_LIBRARIES + XKB::XKB +) + +qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick + SOURCES + extensions/qwaylandivisurfaceintegration.cpp extensions/qwaylandivisurfaceintegration_p.h + extensions/qwaylandquickshellintegration.cpp extensions/qwaylandquickshellintegration.h + extensions/qwaylandquickshellsurfaceitem.cpp extensions/qwaylandquickshellsurfaceitem.h extensions/qwaylandquickshellsurfaceitem_p.h + extensions/qwaylandquickxdgoutputv1.cpp extensions/qwaylandquickxdgoutputv1.h + extensions/qwaylandwlshellintegration.cpp extensions/qwaylandwlshellintegration_p.h + extensions/qwaylandxdgshellintegration.cpp extensions/qwaylandxdgshellintegration_p.h + extensions/qwaylandxdgshellv5integration.cpp extensions/qwaylandxdgshellv5integration_p.h + extensions/qwaylandxdgshellv6integration.cpp extensions/qwaylandxdgshellv6integration_p.h + PUBLIC_LIBRARIES + Qt::Quick +) + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice + SOURCES + wayland_wrapper/qwldatadevice.cpp wayland_wrapper/qwldatadevice_p.h + wayland_wrapper/qwldatadevicemanager.cpp wayland_wrapper/qwldatadevicemanager_p.h + wayland_wrapper/qwldataoffer.cpp wayland_wrapper/qwldataoffer_p.h + wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h +) + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im + SOURCES + compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h +) + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop + SOURCES + compositor_api/qwaylanddrag.cpp compositor_api/qwaylanddrag.h +) + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick + SOURCES + compositor_api/qwaylandquickcompositor.cpp compositor_api/qwaylandquickcompositor.h + compositor_api/qwaylandquickitem.cpp compositor_api/qwaylandquickitem.h compositor_api/qwaylandquickitem_p.h + compositor_api/qwaylandquickoutput.cpp compositor_api/qwaylandquickoutput.h + compositor_api/qwaylandquicksurface.cpp compositor_api/qwaylandquicksurface.h + PUBLIC_LIBRARIES + Qt::Qml + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate +) + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick + SOURCES + compositor_api/qwaylandquickhardwarelayer.cpp compositor_api/qwaylandquickhardwarelayer_p.h +) + +if(QT_FEATURE_opengl AND TARGET Qt::Quick) + + qt6_generate_wayland_protocol_server_sources(WaylandCompositor + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-texture-sharing-unstable-v1.xml + ) + +endif() + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND TARGET Qt::Quick + SOURCES + extensions/qwltexturesharingextension.cpp extensions/qwltexturesharingextension_p.h +) +qt_add_docs(WaylandCompositor + doc/qtwaylandcompositor.qdocconf +) + diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt index 734fb8433..79095147f 100644 --- a/src/compositor/CMakeLists.txt +++ b/src/compositor/CMakeLists.txt @@ -67,6 +67,9 @@ qt_add_module(WaylandCompositor Qt::Core Qt::Gui Wayland::Server + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate ) # Resources: @@ -111,11 +114,39 @@ qt6_generate_wayland_protocol_server_sources(WaylandCompositor ## Scopes: ##################################################################### +if(QT_FEATURE_opengl) + + qt6_generate_wayland_protocol_server_sources(WaylandCompositor + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/hardware-integration.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/server-buffer-extension.xml + ) + +endif() + +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl + SOURCES + hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h + hardware_integration/qwlclientbufferintegrationfactory.cpp hardware_integration/qwlclientbufferintegrationfactory_p.h + hardware_integration/qwlclientbufferintegrationplugin.cpp hardware_integration/qwlclientbufferintegrationplugin_p.h + hardware_integration/qwlhardwarelayerintegration.cpp hardware_integration/qwlhardwarelayerintegration_p.h + hardware_integration/qwlhardwarelayerintegrationfactory.cpp hardware_integration/qwlhardwarelayerintegrationfactory_p.h + hardware_integration/qwlhardwarelayerintegrationplugin.cpp hardware_integration/qwlhardwarelayerintegrationplugin_p.h + hardware_integration/qwlhwintegration.cpp hardware_integration/qwlhwintegration_p.h + hardware_integration/qwlserverbufferintegration.cpp hardware_integration/qwlserverbufferintegration_p.h + hardware_integration/qwlserverbufferintegrationfactory.cpp hardware_integration/qwlserverbufferintegrationfactory_p.h + hardware_integration/qwlserverbufferintegrationplugin.cpp hardware_integration/qwlserverbufferintegrationplugin_p.h + PUBLIC_LIBRARIES + Qt::OpenGL +) + qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon LIBRARIES Qt::XkbCommonSupportPrivate PUBLIC_LIBRARIES XKB::XKB + PRIVATE_MODULE_INTERFACE # special case QTBUG-83063 + Qt::XkbCommonSupportPrivate # special case ) qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick @@ -140,30 +171,6 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h ) -if(QT_FEATURE_opengl) - - qt6_generate_wayland_protocol_server_sources(WaylandCompositor - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/hardware-integration.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/server-buffer-extension.xml - ) - -endif() - -qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl - SOURCES - hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h - hardware_integration/qwlclientbufferintegrationfactory.cpp hardware_integration/qwlclientbufferintegrationfactory_p.h - hardware_integration/qwlclientbufferintegrationplugin.cpp hardware_integration/qwlclientbufferintegrationplugin_p.h - hardware_integration/qwlhardwarelayerintegration.cpp hardware_integration/qwlhardwarelayerintegration_p.h - hardware_integration/qwlhardwarelayerintegrationfactory.cpp hardware_integration/qwlhardwarelayerintegrationfactory_p.h - hardware_integration/qwlhardwarelayerintegrationplugin.cpp hardware_integration/qwlhardwarelayerintegrationplugin_p.h - hardware_integration/qwlhwintegration.cpp hardware_integration/qwlhwintegration_p.h - hardware_integration/qwlserverbufferintegration.cpp hardware_integration/qwlserverbufferintegration_p.h - hardware_integration/qwlserverbufferintegrationfactory.cpp hardware_integration/qwlserverbufferintegrationfactory_p.h - hardware_integration/qwlserverbufferintegrationplugin.cpp hardware_integration/qwlserverbufferintegrationplugin_p.h -) - qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im SOURCES compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h @@ -180,12 +187,11 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick compositor_api/qwaylandquickitem.cpp compositor_api/qwaylandquickitem.h compositor_api/qwaylandquickitem_p.h compositor_api/qwaylandquickoutput.cpp compositor_api/qwaylandquickoutput.h compositor_api/qwaylandquicksurface.cpp compositor_api/qwaylandquicksurface.h - LIBRARIES - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Qml + Qt::QmlPrivate Qt::Quick + Qt::QuickPrivate ) qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp index 2dba85faf..950424adb 100644 --- a/src/compositor/compositor_api/qwaylandclient.cpp +++ b/src/compositor/compositor_api/qwaylandclient.cpp @@ -273,3 +273,6 @@ void QWaylandClient::close() } QT_END_NAMESPACE + +#include "moc_qwaylandclient.cpp" + diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 83833991f..2701837c4 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -1044,3 +1044,5 @@ void QWaylandCompositor::grabSurface(QWaylandSurfaceGrabber *grabber, const QWay } QT_END_NAMESPACE + +#include "moc_qwaylandcompositor.cpp" diff --git a/src/compositor/compositor_api/qwaylanddestroylistener.cpp b/src/compositor/compositor_api/qwaylanddestroylistener.cpp index 958ea311c..a243e032c 100644 --- a/src/compositor/compositor_api/qwaylanddestroylistener.cpp +++ b/src/compositor/compositor_api/qwaylanddestroylistener.cpp @@ -63,3 +63,5 @@ void QWaylandDestroyListenerPrivate::handler(wl_listener *listener, void *data) } QT_END_NAMESPACE + +#include "moc_qwaylanddestroylistener.cpp" diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp index 2108c3906..9bb48b4c3 100644 --- a/src/compositor/compositor_api/qwaylanddrag.cpp +++ b/src/compositor/compositor_api/qwaylanddrag.cpp @@ -130,3 +130,5 @@ void QWaylandDrag::cancelDrag() } QT_END_NAMESPACE + +#include "moc_qwaylanddrag.cpp" diff --git a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp index 5ecb9dfa0..1925d2123 100644 --- a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp +++ b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp @@ -150,3 +150,5 @@ QWaylandTextInput *QWaylandInputMethodControlPrivate::textInput() const { return QWaylandTextInput::findIn(seat); } + +#include "moc_qwaylandinputmethodcontrol.cpp" diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp index 210b683ff..223f19738 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -589,3 +589,5 @@ uint QWaylandKeyboard::keyToScanCode(int qtKey) const } QT_END_NAMESPACE + +#include "moc_qwaylandkeyboard.cpp" diff --git a/src/compositor/compositor_api/qwaylandkeymap.cpp b/src/compositor/compositor_api/qwaylandkeymap.cpp index bd58a84e1..d2f67192d 100644 --- a/src/compositor/compositor_api/qwaylandkeymap.cpp +++ b/src/compositor/compositor_api/qwaylandkeymap.cpp @@ -120,3 +120,5 @@ QWaylandKeymapPrivate::QWaylandKeymapPrivate(const QString &layout, const QStrin } QT_END_NAMESPACE + +#include "moc_qwaylandkeymap.cpp" diff --git a/src/imports/compositor/CMakeLists.txt b/src/imports/compositor/CMakeLists.txt index e65d90193..936701695 100644 --- a/src/imports/compositor/CMakeLists.txt +++ b/src/imports/compositor/CMakeLists.txt @@ -12,18 +12,15 @@ qt_add_qml_module(qwaylandcompositorplugin SOURCES qwaylandmousetracker.cpp qwaylandmousetracker_p.h qwaylandquickcompositorplugin.cpp - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - Qt::WaylandCompositorPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) #### Ignored generated resource: ${CMAKE_CURRENT_BINARY_DIR}/compositor.qrc #### Keys ignored in scope 1:.:.:compositor.pro:<TRUE>: diff --git a/src/imports/texture-sharing-extension/CMakeLists.txt b/src/imports/texture-sharing-extension/CMakeLists.txt index c816448c4..761c3a24e 100644 --- a/src/imports/texture-sharing-extension/CMakeLists.txt +++ b/src/imports/texture-sharing-extension/CMakeLists.txt @@ -11,17 +11,15 @@ qt_add_qml_module(qwaylandtexturesharingextension SKIP_TYPE_REGISTRATION SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QuickPrivate - Qt::WaylandCompositorPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml - Qt::Quick + Qt::QuickPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) #### Keys ignored in scope 1:.:.:texture-sharing-extension.pro:<TRUE>: diff --git a/src/imports/texture-sharing/CMakeLists.txt b/src/imports/texture-sharing/CMakeLists.txt index cc787b288..baf118d24 100644 --- a/src/imports/texture-sharing/CMakeLists.txt +++ b/src/imports/texture-sharing/CMakeLists.txt @@ -13,17 +13,16 @@ qt_add_qml_module(qwaylandtexturesharing plugin.cpp sharedtextureprovider.cpp sharedtextureprovider.h texturesharingextension.cpp texturesharingextension.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QuickPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate + Qt::OpenGL Qt::Qml - Qt::Quick + Qt::QuickPrivate Qt::WaylandClient + Qt::WaylandClientPrivate ) qt6_generate_wayland_protocol_client_sources(qwaylandtexturesharing diff --git a/src/plugins/decorations/bradient/CMakeLists.txt b/src/plugins/decorations/bradient/CMakeLists.txt index 760718cac..9bd875a40 100644 --- a/src/plugins/decorations/bradient/CMakeLists.txt +++ b/src/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/hardwareintegration/client/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt index e02b020e6..038a8843c 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from brcm-egl.pro. ##################################################################### -## brcm-egl Plugin: +## QWaylandBrcmEglClientBufferPlugin Plugin: ##################################################################### -qt_add_plugin(brcm-egl +qt_add_plugin(QWaylandBrcmEglClientBufferPlugin + OUTPUT_NAME brcm-egl TYPE wayland-graphics-integration-client - CLASS_NAME QWaylandBrcmEglClientBufferPlugin SOURCES ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h @@ -14,20 +14,17 @@ qt_add_plugin(brcm-egl main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/brcm-egl - LIBRARIES - Qt::EglSupportPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} EGL::EGL Qt::Core - Qt::EglSupport + Qt::EglSupportPrivate Qt::Gui - Qt::WaylandClient + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(brcm-egl +qt6_generate_wayland_protocol_client_sources(QWaylandBrcmEglClientBufferPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/brcm-egl/../../../extensions/brcm.xml ) diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt index 41d7c12e2..f31e868ac 100644 --- a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt @@ -1,28 +1,27 @@ # Generated from dmabuf-server.pro. ##################################################################### -## dmabuf-server Plugin: +## DmaBufServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(dmabuf-server +qt_add_plugin(DmaBufServerBufferPlugin + OUTPUT_NAME dmabuf-server TYPE wayland-graphics-integration-client - CLASS_NAME DmaBufServerBufferPlugin SOURCES ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/dmabuf-server - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES EGL::EGL Qt::Core Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(dmabuf-server +qt6_generate_wayland_protocol_client_sources(DmaBufServerBufferPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/dmabuf-server/../../../extensions/qt-dmabuf-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt index 337857cc2..ce3f94254 100644 --- a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt @@ -1,28 +1,27 @@ # Generated from drm-egl-server.pro. ##################################################################### -## drm-egl-server Plugin: +## DrmEglServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(drm-egl-server +qt_add_plugin(DrmEglServerBufferPlugin + OUTPUT_NAME drm-egl-server TYPE wayland-graphics-integration-client - CLASS_NAME DrmEglServerBufferPlugin SOURCES ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/drm-egl-server - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES EGL::EGL Qt::Core Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(drm-egl-server +qt6_generate_wayland_protocol_client_sources(DrmEglServerBufferPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/drm-egl-server/../../../extensions/drm-egl-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt index ca1738f50..24cc9219e 100644 --- a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt @@ -1,28 +1,26 @@ # Generated from libhybris-egl-server.pro. ##################################################################### -## libhybris-egl-server Plugin: +## LibHybrisEglServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(libhybris-egl-server +qt_add_plugin(LibHybrisEglServerBufferPlugin + OUTPUT_NAME libhybris-egl-server TYPE wayland-graphics-integration-client - CLASS_NAME LibHybrisEglServerBufferPlugin SOURCES ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/libhybris-egl-server - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES EGL::EGL Qt::Core Qt::Gui - Qt::WaylandClient + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(libhybris-egl-server +qt6_generate_wayland_protocol_client_sources(LibHybrisEglServerBufferPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/libhybris-egl-server/../../../extensions/libhybris-egl-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt index d7a7294ec..aa6e44331 100644 --- a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt @@ -1,27 +1,26 @@ # Generated from shm-emulation-server.pro. ##################################################################### -## shm-emulation-server Plugin: +## ShmServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(shm-emulation-server +qt_add_plugin(ShmServerBufferPlugin + OUTPUT_NAME shm-emulation-server TYPE wayland-graphics-integration-client - CLASS_NAME ShmServerBufferPlugin SOURCES ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/shm-emulation-server - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(shm-emulation-server +qt6_generate_wayland_protocol_client_sources(ShmServerBufferPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/shm-emulation-server/../../../extensions/shm-emulation-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt index 46ad01249..64ea378fa 100644 --- a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt @@ -1,27 +1,26 @@ # Generated from vulkan-server.pro. ##################################################################### -## vulkan-server Plugin: +## VulkanServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(vulkan-server +qt_add_plugin(VulkanServerBufferPlugin + OUTPUT_NAME vulkan-server TYPE wayland-graphics-integration-client - CLASS_NAME VulkanServerBufferPlugin SOURCES ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/vulkan-server - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::OpenGL + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(vulkan-server +qt6_generate_wayland_protocol_client_sources(VulkanServerBufferPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/vulkan-server/../../../extensions/qt-vulkan-server-buffer-unstable-v1.xml ) diff --git a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt index cbe1b6a9f..2eaf092cc 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from wayland-egl.pro. ##################################################################### -## qt-plugin-wayland-egl Plugin: +## QWaylandEglClientBufferPlugin Plugin: ##################################################################### -qt_add_plugin(qt-plugin-wayland-egl +qt_add_plugin(QWaylandEglClientBufferPlugin + OUTPUT_NAME qt-plugin-wayland-egl TYPE wayland-graphics-integration-client - CLASS_NAME QWaylandEglClientBufferPlugin SOURCES ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h ../../../../hardwareintegration/client/wayland-egl/qwaylandeglinclude.h @@ -15,15 +15,13 @@ qt_add_plugin(qt-plugin-wayland-egl main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/wayland-egl - LIBRARIES - Qt::EglSupportPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES EGL::EGL Qt::Core - Qt::EglSupport + Qt::EglSupportPrivate Qt::Gui - Qt::WaylandClient + Qt::OpenGLPrivate + Qt::WaylandClientPrivate Wayland::Client Wayland::Egl ) diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt index a4b6e2741..972cb1ace 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-egl.pro. ##################################################################### -## xcomposite-egl Plugin: +## QWaylandXCompositeEglClientBufferPlugin Plugin: ##################################################################### -qt_add_plugin(xcomposite-egl +qt_add_plugin(QWaylandXCompositeEglClientBufferPlugin + OUTPUT_NAME xcomposite-egl TYPE wayland-graphics-integration-client - CLASS_NAME QWaylandXCompositeEglClientBufferPlugin SOURCES ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h @@ -16,21 +16,18 @@ qt_add_plugin(xcomposite-egl INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/xcomposite-egl ../../../../hardwareintegration/client/xcomposite_share - LIBRARIES - Qt::EglSupportPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES EGL::EGL PkgConfig::XComposite Qt::Core - Qt::EglSupport + Qt::EglSupportPrivate Qt::Gui - Qt::WaylandClient + Qt::WaylandClientPrivate Wayland::Client X11::X11 ) -qt6_generate_wayland_protocol_client_sources(xcomposite-egl +qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeEglClientBufferPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml ) diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt index 179dd8db2..d074fe4ee 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-glx.pro. ##################################################################### -## xcomposite-glx Plugin: +## QWaylandXCompositeGlxClientBufferPlugin Plugin: ##################################################################### -qt_add_plugin(xcomposite-glx +qt_add_plugin(QWaylandXCompositeGlxClientBufferPlugin + OUTPUT_NAME xcomposite-glx TYPE wayland-graphics-integration-client - CLASS_NAME QWaylandXCompositeGlxClientBufferPlugin SOURCES ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h @@ -16,21 +16,18 @@ qt_add_plugin(xcomposite-glx INCLUDE_DIRECTORIES ../../../../hardwareintegration/client/xcomposite-glx ../../../../hardwareintegration/client/xcomposite_share - LIBRARIES - Qt::GlxSupportPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} PkgConfig::XComposite Qt::Core - Qt::GlxSupport + Qt::GlxSupportPrivate Qt::Gui - Qt::WaylandClient + Qt::WaylandClientPrivate Wayland::Client X11::X11 ) -qt6_generate_wayland_protocol_client_sources(xcomposite-glx +qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeGlxClientBufferPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml ) diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt index cbe9a8de8..fb3dc1adf 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from brcm-egl.pro. ##################################################################### -## qt-wayland-compositor-brcm-egl Plugin: +## QWaylandBrcmClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-brcm-egl +qt_add_plugin(QWaylandBrcmClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-brcm-egl TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandBrcmClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.h ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.h @@ -14,17 +14,15 @@ qt_add_plugin(qt-wayland-compositor-brcm-egl INCLUDE_DIRECTORIES ../../../../hardwareintegration/compositor/brcm-egl LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-brcm-egl +qt6_generate_wayland_protocol_server_sources(QWaylandBrcmClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/brcm-egl/../../../extensions/brcm.xml ) diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt index eb66943e5..80cfd59b0 100644 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from dmabuf-server.pro. ##################################################################### -## qt-wayland-compositor-dmabuf-server-buffer Plugin: +## DmaBufServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-dmabuf-server-buffer +qt_add_plugin(DmaBufServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-dmabuf-server-buffer TYPE wayland-graphics-integration-server - CLASS_NAME DmaBufServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h main.cpp @@ -14,17 +14,16 @@ qt_add_plugin(qt-wayland-compositor-dmabuf-server-buffer ../../../../hardwareintegration/compositor/dmabuf-server LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate + Libdrm::Libdrm Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-dmabuf-server-buffer +qt6_generate_wayland_protocol_server_sources(DmaBufServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/dmabuf-server/../../../extensions/qt-dmabuf-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt index 75803bbeb..95c726fe2 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from drm-egl-server.pro. ##################################################################### -## qt-wayland-compositor-drm-egl-server-buffer Plugin: +## DrmEglServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-drm-egl-server-buffer +qt_add_plugin(DrmEglServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-drm-egl-server-buffer TYPE wayland-graphics-integration-server - CLASS_NAME DrmEglServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h main.cpp @@ -14,17 +14,15 @@ qt_add_plugin(qt-wayland-compositor-drm-egl-server-buffer ../../../../hardwareintegration/compositor/drm-egl-server LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-drm-egl-server-buffer +qt6_generate_wayland_protocol_server_sources(DrmEglServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/drm-egl-server/../../../extensions/drm-egl-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt index c10ce1101..f1040f7d4 100644 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from vsp2.pro. ##################################################################### -## qt-wayland-compositor-vsp2 Plugin: +## Vsp2HardwareLayerIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-vsp2 +qt_add_plugin(Vsp2HardwareLayerIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-vsp2 TYPE wayland-hardware-layer-integration - CLASS_NAME Vsp2HardwareLayerIntegrationPlugin SOURCES ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h main.cpp @@ -14,14 +14,12 @@ qt_add_plugin(qt-wayland-compositor-vsp2 ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2 LIBRARIES PkgConfig::Waylandkms - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) #### Keys ignored in scope 1:.:.:vsp2.pro:<TRUE>: diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt index 0dc08b7ab..f0e6bec6c 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from libhybris-egl-server.pro. ##################################################################### -## qt-wayland-compositor-libybris-egl-server.json Plugin: +## LibHybrisEglServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-libybris-egl-server.json +qt_add_plugin(LibHybrisEglServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-libybris-egl-server.json TYPE wayland-graphics-integration-server - CLASS_NAME LibHybrisEglServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h main.cpp @@ -14,17 +14,15 @@ qt_add_plugin(qt-wayland-compositor-libybris-egl-server.json ../../../../hardwareintegration/compositor/libhybris-egl-server LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-libybris-egl-server.json +qt6_generate_wayland_protocol_server_sources(LibHybrisEglServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/libhybris-egl-server/../../../extensions/libhybris-egl-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt index 6d0a70398..35ffd7dcc 100644 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from linux-dmabuf-unstable-v1.pro. ##################################################################### -## qt-wayland-compositor-linux-dmabuf-unstable-v1 Plugin: +## QWaylandDmabufClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-linux-dmabuf-unstable-v1 +qt_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-linux-dmabuf-unstable-v1 TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandDmabufClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h @@ -15,19 +15,17 @@ qt_add_plugin(qt-wayland-compositor-linux-dmabuf-unstable-v1 ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1 LIBRARIES EGL::EGL + Libdrm::Libdrm + Wayland::Server + PUBLIC_LIBRARIES Qt::CorePrivate Qt::EglSupportPrivate Qt::GuiPrivate - Qt::WaylandCompositorPrivate - Wayland::Server - PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::Gui Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-linux-dmabuf-unstable-v1 +qt6_generate_wayland_protocol_server_sources(QWaylandDmabufClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/../../../3rdparty/protocol/linux-dmabuf-unstable-v1.xml ) diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt index d49a06007..707a53809 100644 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt @@ -1,29 +1,27 @@ # Generated from shm-emulation-server.pro. ##################################################################### -## qt-wayland-compositor-shm-emulation-server Plugin: +## ShmServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-shm-emulation-server +qt_add_plugin(ShmServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-shm-emulation-server TYPE wayland-graphics-integration-server - CLASS_NAME ShmServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/compositor/shm-emulation-server LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-shm-emulation-server +qt6_generate_wayland_protocol_server_sources(ShmServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/shm-emulation-server/../../../extensions/shm-emulation-server-buffer.xml ) diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt index e666e1441..472728a64 100644 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from vulkan-server.pro. ##################################################################### -## qt-wayland-compositor-vulkan-server Plugin: +## VulkanServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-vulkan-server +qt_add_plugin(VulkanServerBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-vulkan-server TYPE wayland-graphics-integration-server - CLASS_NAME VulkanServerBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.h @@ -15,19 +15,16 @@ qt_add_plugin(qt-wayland-compositor-vulkan-server ../../../../hardwareintegration/compositor/vulkan-server ../../../../hardwareintegration/compositor/vulkan-server/../../../3rdparty/util LIBRARIES + Wayland::Server + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::VulkanSupportPrivate - Qt::WaylandCompositorPrivate - Wayland::Server - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::VulkanSupport Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-vulkan-server +qt6_generate_wayland_protocol_server_sources(VulkanServerBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/vulkan-server/../../../extensions/qt-vulkan-server-buffer-unstable-v1.xml ) diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt index 558403a11..ea307288d 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from wayland-egl.pro. ##################################################################### -## qt-wayland-compositor-wayland-egl Plugin: +## QWaylandEglClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-wayland-egl +qt_add_plugin(QWaylandEglClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-wayland-egl TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandEglClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h main.cpp @@ -14,17 +14,14 @@ qt_add_plugin(qt-wayland-compositor-wayland-egl ../../../../hardwareintegration/compositor/wayland-egl LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::EglSupportPrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Egl Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::Gui + Qt::CorePrivate + Qt::EglSupportPrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) #### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>: diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt index 5d1cacc05..10932f15a 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from wayland-eglstream-controller.pro. ##################################################################### -## qt-wayland-compositor-wayland-eglstream-controller Plugin: +## QWaylandEglStreamBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-wayland-eglstream-controller +qt_add_plugin(QWaylandEglStreamBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandEglStreamBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h @@ -15,20 +15,17 @@ qt_add_plugin(qt-wayland-compositor-wayland-eglstream-controller ../../../../hardwareintegration/compositor/wayland-eglstream-controller LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::EglSupportPrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Egl Wayland::Server PUBLIC_LIBRARIES - Qt::Core - Qt::EglSupport - Qt::Gui + Qt::CorePrivate + Qt::EglSupportPrivate + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-wayland-eglstream-controller +qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml ) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt index 76dee2845..c8beed397 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-egl.pro. ##################################################################### -## qt-wayland-compositor-xcomposite-egl Plugin: +## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-xcomposite-egl +qt_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-xcomposite-egl TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandXCompositeEglClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h @@ -18,19 +18,19 @@ qt_add_plugin(qt-wayland-compositor-xcomposite-egl ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES EGL::EGL - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server X11::X11 PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-xcomposite-egl +qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeEglClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt index 450a9df77..997273548 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-glx.pro. ##################################################################### -## qt-wayland-compositor-xcomposite-glx Plugin: +## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-xcomposite-glx +qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-xcomposite-glx TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandXCompositeGlxClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h @@ -17,18 +17,18 @@ qt_add_plugin(qt-wayland-compositor-xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-xcomposite-glx +qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt index ecb8066de..b625c22b7 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-glx.pro. ##################################################################### -## qt-wayland-compositor-xcomposite-glx Plugin: +## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-xcomposite-glx +qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-xcomposite-glx TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandXCompositeGlxClientBufferIntegrationPlugin SOURCES ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h @@ -17,19 +17,19 @@ qt_add_plugin(qt-wayland-compositor-xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES - Qt::CorePrivate Qt::GlxSupportPrivate # special case - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-xcomposite-glx +qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml diff --git a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt index ed42a728d..554f24ba7 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from qwayland-brcm-egl.pro. ##################################################################### -## qwayland-brcm-egl Plugin: +## QWaylandBrcmEglPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwayland-brcm-egl +qt_add_plugin(QWaylandBrcmEglPlatformIntegrationPlugin + OUTPUT_NAME qwayland-brcm-egl TYPE platforms - CLASS_NAME QWaylandBrcmEglPlatformIntegrationPlugin 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(qwayland-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(qwayland-brcm-egl +qt6_generate_wayland_protocol_client_sources(QWaylandBrcmEglPlatformIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/brcm-egl/../../../extensions/brcm.xml ) diff --git a/src/plugins/platforms/qwayland-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-egl/CMakeLists.txt index 03cfdfcc3..5a4e3626b 100644 --- a/src/plugins/platforms/qwayland-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from qwayland-egl.pro. ##################################################################### -## qwayland-egl Plugin: +## QWaylandEglPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwayland-egl +qt_add_plugin(QWaylandEglPlatformIntegrationPlugin + OUTPUT_NAME qwayland-egl TYPE platforms - CLASS_NAME QWaylandEglPlatformIntegrationPlugin 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(qwayland-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/qwayland-generic/.prev_CMakeLists.txt b/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt index d3d71e3fe..a6d932cd7 100644 --- a/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt +++ b/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt @@ -1,20 +1,18 @@ # Generated from qwayland-generic.pro. ##################################################################### -## qwayland-generic Plugin: +## QWaylandIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwayland-generic +qt_add_plugin(QWaylandIntegrationPlugin + OUTPUT_NAME qwayland-generic TYPE platforms - CLASS_NAME QWaylandIntegrationPlugin SOURCES main.cpp - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::WaylandClientPrivate ) #### Keys ignored in scope 1:.:.:qwayland-generic.pro:<TRUE>: diff --git a/src/plugins/platforms/qwayland-generic/CMakeLists.txt b/src/plugins/platforms/qwayland-generic/CMakeLists.txt index e512e5b05..342e71189 100644 --- a/src/plugins/platforms/qwayland-generic/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-generic/CMakeLists.txt @@ -1,21 +1,19 @@ # Generated from qwayland-generic.pro. ##################################################################### -## qwayland-generic Plugin: +## QWaylandIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwayland-generic +qt_add_plugin(QWaylandIntegrationPlugin + OUTPUT_NAME qwayland-generic TYPE platforms - CLASS_NAME QWaylandIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wayland # special case SOURCES main.cpp - LIBRARIES - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::WaylandClient + Qt::WaylandClientPrivate ) #### Keys ignored in scope 1:.:.:qwayland-generic.pro:<TRUE>: diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt index c0dbf5368..4b84b449d 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from qwayland-xcomposite-egl.pro. ##################################################################### -## qwayland-xcomposite-egl Plugin: +## QWaylandXCompositeEglPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwayland-xcomposite-egl +qt_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin + OUTPUT_NAME qwayland-xcomposite-egl TYPE platforms - CLASS_NAME QWaylandXCompositeEglPlatformIntegrationPlugin 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(qwayland-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(qwayland-xcomposite-egl +qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeEglPlatformIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml ) diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt index ac8dce830..1ff3c5ffc 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from qwayland-xcomposite-glx.pro. ##################################################################### -## qwayland-xcomposite-glx Plugin: +## QWaylandXCompositeGlxPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwayland-xcomposite-glx +qt_add_plugin(QWaylandXCompositeGlxPlatformIntegrationPlugin + OUTPUT_NAME qwayland-xcomposite-glx TYPE platforms - CLASS_NAME QWaylandXCompositeGlxPlatformIntegrationPlugin 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 @@ -17,21 +17,18 @@ qt_add_plugin(qwayland-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(qwayland-xcomposite-glx +qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeGlxPlatformIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml ) diff --git a/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt b/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt index 7cc47c757..9e068dfe2 100644 --- a/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt +++ b/src/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/shellintegration/ivi-shell/CMakeLists.txt b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt index 214c5ee66..4fe1016b0 100644 --- a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt +++ b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt @@ -1,27 +1,25 @@ # Generated from ivi-shell.pro. ##################################################################### -## ivi-shell Plugin: +## QWaylandIviShellIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(ivi-shell +qt_add_plugin(QWaylandIviShellIntegrationPlugin + OUTPUT_NAME ivi-shell TYPE wayland-shell-integration - CLASS_NAME QWaylandIviShellIntegrationPlugin SOURCES main.cpp qwaylandivishellintegration.cpp qwaylandivishellintegration.h qwaylandivisurface.cpp qwaylandivisurface_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(ivi-shell +qt6_generate_wayland_protocol_client_sources(QWaylandIviShellIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/ivi-application.xml ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/ivi-controller.xml @@ -33,7 +31,7 @@ qt6_generate_wayland_protocol_client_sources(ivi-shell ## Scopes: ##################################################################### -qt_extend_target(ivi-shell CONDITION QT_FEATURE_xkbcommon +qt_extend_target(QWaylandIviShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon PUBLIC_LIBRARIES XKB::XKB ) diff --git a/src/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/shellintegration/wl-shell/CMakeLists.txt index 858915242..496bbe68c 100644 --- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/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/shellintegration/xdg-shell-v5/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt index 3fa2ba746..fec8b2c89 100644 --- a/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt +++ b/src/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/shellintegration/xdg-shell-v6/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt index d6fa7dd6a..094610155 100644 --- a/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt +++ b/src/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/shellintegration/xdg-shell/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt index 96a02fc7f..848a0ec60 100644 --- a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt +++ b/src/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/qtwaylandscanner/.prev_CMakeLists.txt b/src/qtwaylandscanner/.prev_CMakeLists.txt new file mode 100644 index 000000000..bb413544c --- /dev/null +++ b/src/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:<TRUE>: +# _OPTION = "host_build" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 57d928bf6..abc3f851f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,6 @@ # Generated from tests.pro. +qt_find_package(Threads REQUIRED) # special case if(QT_BUILD_STANDALONE_TESTS) # Add qt_find_package calls for extra dependencies that need to be found when building # the standalone tests here. @@ -18,5 +19,4 @@ if(QT_BUILD_STANDALONE_TESTS) qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner) # special case end endif() -qt_find_package(Threads REQUIRED) # special case qt_build_tests() diff --git a/tests/auto/client/CMakeLists.txt b/tests/auto/client/CMakeLists.txt index bd18ec3e1..5939853cc 100644 --- a/tests/auto/client/CMakeLists.txt +++ b/tests/auto/client/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/client/client/.prev_CMakeLists.txt b/tests/auto/client/client/.prev_CMakeLists.txt index 6fe4bb92d..c52ab320b 100644 --- a/tests/auto/client/client/.prev_CMakeLists.txt +++ b/tests/auto/client/client/.prev_CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client tst_client.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::WaylandClientPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::WaylandClient Wayland::Client Wayland::Server ) diff --git a/tests/auto/client/client/CMakeLists.txt b/tests/auto/client/client/CMakeLists.txt index a20ea811c..f7e317c77 100644 --- a/tests/auto/client/client/CMakeLists.txt +++ b/tests/auto/client/client/CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client tst_client.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::WaylandClientPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::WaylandClient Wayland::Client Wayland::Server Threads::Threads # special case diff --git a/tests/auto/client/datadevicev1/.prev_CMakeLists.txt b/tests/auto/client/datadevicev1/.prev_CMakeLists.txt index bfea14349..97dedb855 100644 --- a/tests/auto/client/datadevicev1/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/datadevicev1/CMakeLists.txt b/tests/auto/client/datadevicev1/CMakeLists.txt index ad58772d4..e635e33ce 100644 --- a/tests/auto/client/datadevicev1/CMakeLists.txt +++ b/tests/auto/client/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/client/fullscreenshellv1/.prev_CMakeLists.txt b/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt index 5daef3bb3..c9e5eae13 100644 --- a/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt +++ b/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_fullscreenshellv1 tst_fullscreenshellv1.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::WaylandClientPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::WaylandClient Wayland::Client Wayland::Server ) diff --git a/tests/auto/client/fullscreenshellv1/CMakeLists.txt b/tests/auto/client/fullscreenshellv1/CMakeLists.txt index 00348df99..73d92ead8 100644 --- a/tests/auto/client/fullscreenshellv1/CMakeLists.txt +++ b/tests/auto/client/fullscreenshellv1/CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_fullscreenshellv1 tst_fullscreenshellv1.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::WaylandClientPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::WaylandClient Wayland::Client Wayland::Server Threads::Threads # special case diff --git a/tests/auto/client/inputcontext/.prev_CMakeLists.txt b/tests/auto/client/inputcontext/.prev_CMakeLists.txt index d5df86a13..cf2301e77 100644 --- a/tests/auto/client/inputcontext/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/inputcontext/CMakeLists.txt b/tests/auto/client/inputcontext/CMakeLists.txt index dfa788b31..f061a7ea2 100644 --- a/tests/auto/client/inputcontext/CMakeLists.txt +++ b/tests/auto/client/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/client/iviapplication/.prev_CMakeLists.txt b/tests/auto/client/iviapplication/.prev_CMakeLists.txt index 4193ba9b0..0453aad81 100644 --- a/tests/auto/client/iviapplication/.prev_CMakeLists.txt +++ b/tests/auto/client/iviapplication/.prev_CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_iviapplication tst_iviapplication.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::WaylandClientPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::WaylandClient Wayland::Client Wayland::Server ) diff --git a/tests/auto/client/iviapplication/CMakeLists.txt b/tests/auto/client/iviapplication/CMakeLists.txt index 38111c95e..7e3bfd73a 100644 --- a/tests/auto/client/iviapplication/CMakeLists.txt +++ b/tests/auto/client/iviapplication/CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_iviapplication tst_iviapplication.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::WaylandClientPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::WaylandClient Wayland::Client Wayland::Server Threads::Threads # special case diff --git a/tests/auto/client/nooutput/.prev_CMakeLists.txt b/tests/auto/client/nooutput/.prev_CMakeLists.txt new file mode 100644 index 000000000..3f09f584c --- /dev/null +++ b/tests/auto/client/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/client/nooutput/CMakeLists.txt b/tests/auto/client/nooutput/CMakeLists.txt new file mode 100644 index 000000000..e5110c0c9 --- /dev/null +++ b/tests/auto/client/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/client/output/.prev_CMakeLists.txt b/tests/auto/client/output/.prev_CMakeLists.txt index 8595888e9..09ca5d6d4 100644 --- a/tests/auto/client/output/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/output/CMakeLists.txt b/tests/auto/client/output/CMakeLists.txt index c453ac424..5d2dfbf9d 100644 --- a/tests/auto/client/output/CMakeLists.txt +++ b/tests/auto/client/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/client/primaryselectionv1/.prev_CMakeLists.txt b/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt index 77a994dd4..f86e81e12 100644 --- a/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/primaryselectionv1/CMakeLists.txt b/tests/auto/client/primaryselectionv1/CMakeLists.txt index af9122343..d101c8b3d 100644 --- a/tests/auto/client/primaryselectionv1/CMakeLists.txt +++ b/tests/auto/client/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/client/seatv4/.prev_CMakeLists.txt b/tests/auto/client/seatv4/.prev_CMakeLists.txt index ab7eb380f..9e0e4c37e 100644 --- a/tests/auto/client/seatv4/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/seatv4/CMakeLists.txt b/tests/auto/client/seatv4/CMakeLists.txt index bd14a6a8b..36b0c8471 100644 --- a/tests/auto/client/seatv4/CMakeLists.txt +++ b/tests/auto/client/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/client/seatv5/.prev_CMakeLists.txt b/tests/auto/client/seatv5/.prev_CMakeLists.txt index 778c42c0b..11d615fb2 100644 --- a/tests/auto/client/seatv5/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/seatv5/CMakeLists.txt b/tests/auto/client/seatv5/CMakeLists.txt index 38c5d980f..fefdcf8db 100644 --- a/tests/auto/client/seatv5/CMakeLists.txt +++ b/tests/auto/client/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/client/surface/.prev_CMakeLists.txt b/tests/auto/client/surface/.prev_CMakeLists.txt index bb7289286..43d6ec34e 100644 --- a/tests/auto/client/surface/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/surface/CMakeLists.txt b/tests/auto/client/surface/CMakeLists.txt index 1470f414e..a1545115e 100644 --- a/tests/auto/client/surface/CMakeLists.txt +++ b/tests/auto/client/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/client/tabletv2/.prev_CMakeLists.txt b/tests/auto/client/tabletv2/.prev_CMakeLists.txt new file mode 100644 index 000000000..e7fc3f60f --- /dev/null +++ b/tests/auto/client/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/client/tabletv2/CMakeLists.txt b/tests/auto/client/tabletv2/CMakeLists.txt new file mode 100644 index 000000000..f5a12c554 --- /dev/null +++ b/tests/auto/client/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/client/wl_connect/CMakeLists.txt b/tests/auto/client/wl_connect/CMakeLists.txt index 5ad3ac6a4..5a01bedd0 100644 --- a/tests/auto/client/wl_connect/CMakeLists.txt +++ b/tests/auto/client/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/client/xdgdecorationv1/.prev_CMakeLists.txt b/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt index a73e1055c..9311070a8 100644 --- a/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/xdgdecorationv1/CMakeLists.txt b/tests/auto/client/xdgdecorationv1/CMakeLists.txt index 5d26b7fc8..de067a135 100644 --- a/tests/auto/client/xdgdecorationv1/CMakeLists.txt +++ b/tests/auto/client/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/client/xdgoutput/.prev_CMakeLists.txt b/tests/auto/client/xdgoutput/.prev_CMakeLists.txt index 1a3afc1e2..505c7c050 100644 --- a/tests/auto/client/xdgoutput/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/xdgoutput/CMakeLists.txt b/tests/auto/client/xdgoutput/CMakeLists.txt index 855268c94..e0a4b756e 100644 --- a/tests/auto/client/xdgoutput/CMakeLists.txt +++ b/tests/auto/client/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/client/xdgshell/.prev_CMakeLists.txt b/tests/auto/client/xdgshell/.prev_CMakeLists.txt index 4dc670e9d..65f762107 100644 --- a/tests/auto/client/xdgshell/.prev_CMakeLists.txt +++ b/tests/auto/client/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/client/xdgshell/CMakeLists.txt b/tests/auto/client/xdgshell/CMakeLists.txt index 025013e9f..cab6c8825 100644 --- a/tests/auto/client/xdgshell/CMakeLists.txt +++ b/tests/auto/client/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/client/xdgshellv6/.prev_CMakeLists.txt b/tests/auto/client/xdgshellv6/.prev_CMakeLists.txt index ee3514f58..8fb87235b 100644 --- a/tests/auto/client/xdgshellv6/.prev_CMakeLists.txt +++ b/tests/auto/client/xdgshellv6/.prev_CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_xdgshellv6 tst_xdgshellv6.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::WaylandClientPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::WaylandClient Wayland::Client Wayland::Server ) diff --git a/tests/auto/client/xdgshellv6/CMakeLists.txt b/tests/auto/client/xdgshellv6/CMakeLists.txt index fe3588899..03acb4815 100644 --- a/tests/auto/client/xdgshellv6/CMakeLists.txt +++ b/tests/auto/client/xdgshellv6/CMakeLists.txt @@ -17,13 +17,12 @@ qt_add_test(tst_client_xdgshellv6 tst_xdgshellv6.cpp INCLUDE_DIRECTORIES ../shared_old - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::WaylandClientPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::WaylandClient Wayland::Client Wayland::Server Threads::Threads # special case diff --git a/tests/auto/compositor/compositor/CMakeLists.txt b/tests/auto/compositor/compositor/CMakeLists.txt index 511550e99..7e27448f2 100644 --- a/tests/auto/compositor/compositor/CMakeLists.txt +++ b/tests/auto/compositor/compositor/CMakeLists.txt @@ -15,13 +15,12 @@ qt_add_test(tst_compositor testkeyboardgrabber.cpp testkeyboardgrabber.h testseat.cpp testseat.h tst_compositor.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositorPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate Wayland::Client Wayland::Server ) diff --git a/tests/manual/qmlclient/CMakeLists.txt b/tests/manual/qmlclient/CMakeLists.txt index 7be97f49d..5443fcbc1 100644 --- a/tests/manual/qmlclient/CMakeLists.txt +++ b/tests/manual/qmlclient/CMakeLists.txt @@ -8,11 +8,10 @@ qt_add_manual_test(qmlclient GUI SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Quick Qt::WaylandClient ) diff --git a/tests/manual/subsurface/CMakeLists.txt b/tests/manual/subsurface/CMakeLists.txt index 10ec44511..fd450f203 100644 --- a/tests/manual/subsurface/CMakeLists.txt +++ b/tests/manual/subsurface/CMakeLists.txt @@ -9,11 +9,10 @@ qt_add_manual_test(subsurface SOURCES main.cpp shmwindow.cpp shmwindow.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Quick Qt::WaylandClient ) diff --git a/tests/manual/texture-sharing/cpp-client/CMakeLists.txt b/tests/manual/texture-sharing/cpp-client/CMakeLists.txt index 4186ce995..03819d3a3 100644 --- a/tests/manual/texture-sharing/cpp-client/CMakeLists.txt +++ b/tests/manual/texture-sharing/cpp-client/CMakeLists.txt @@ -11,12 +11,10 @@ qt_add_manual_test(cpp-client main.cpp INCLUDE_DIRECTORIES ../../../../src/imports/texture-sharing - LIBRARIES - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::WaylandClientPrivate ) qt6_generate_wayland_protocol_client_sources(cpp-client |