diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-09 17:09:48 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-11 16:12:35 +0000 |
commit | 675fab22fb773053084d168e22aa141669e48e4d (patch) | |
tree | 2a6070f62f840d33680c6940734ecabd97cd0c57 | |
parent | f8d81b3102efb08d3a2ac8f35d250caa4e55ab27 (diff) | |
download | qtwayland-675fab22fb773053084d168e22aa141669e48e4d.tar.gz |
Remove QMake project files
This includes removal of the corresponding .prev_CMakeLists.txt files.
Task-number: QTBUG-88742
Change-Id: I57922bff138258f5b35d484caa4b00d84e924a06
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit b934e1c029442173c76ef9d3d1b040de0c260ca1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
105 files changed, 0 insertions, 2270 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt deleted file mode 100644 index bb243318..00000000 --- a/.prev_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Generated from qtwayland.pro. - -cmake_minimum_required(VERSION 3.15.0) - -include(.cmake.conf) -project(wayland_FIXME - VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt wayland_FIXME Libraries" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C -) - -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 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) - message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") - return() -endif() -qt_build_repo() diff --git a/qtwayland.pro b/qtwayland.pro deleted file mode 100644 index 1dfa06ae..00000000 --- a/qtwayland.pro +++ /dev/null @@ -1,3 +0,0 @@ -requires(linux:!android|macos|qnx) -requires(qtHaveModule(gui)) -load(qt_parts) diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt deleted file mode 100644 index 5fb1675c..00000000 --- a/src/.prev_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# 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 deleted file mode 100644 index ede73a07..00000000 --- a/src/client/.prev_CMakeLists.txt +++ /dev/null @@ -1,131 +0,0 @@ -# Generated from client.pro. - -##################################################################### -## WaylandClient Module: -##################################################################### - -qt_internal_add_module(WaylandClient - PLUGIN_TYPES wayland-graphics-integration-client wayland-inputdevice-integration wayland-decoration-client wayland-shell-integration - SOURCES - ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h - ../shared/qwaylandmimehelper.cpp ../shared/qwaylandmimehelper_p.h - ../shared/qwaylandsharedmemoryformathelper_p.h - global/qwaylandclientextension.cpp global/qwaylandclientextension.h global/qwaylandclientextension_p.h - hardwareintegration/qwaylandclientbufferintegration.cpp hardwareintegration/qwaylandclientbufferintegration_p.h - hardwareintegration/qwaylandclientbufferintegrationfactory.cpp hardwareintegration/qwaylandclientbufferintegrationfactory_p.h - hardwareintegration/qwaylandclientbufferintegrationplugin.cpp hardwareintegration/qwaylandclientbufferintegrationplugin_p.h - hardwareintegration/qwaylandhardwareintegration.cpp hardwareintegration/qwaylandhardwareintegration_p.h - hardwareintegration/qwaylandserverbufferintegration.cpp hardwareintegration/qwaylandserverbufferintegration_p.h - hardwareintegration/qwaylandserverbufferintegrationfactory.cpp hardwareintegration/qwaylandserverbufferintegrationfactory_p.h - hardwareintegration/qwaylandserverbufferintegrationplugin.cpp hardwareintegration/qwaylandserverbufferintegrationplugin_p.h - inputdeviceintegration/qwaylandinputdeviceintegration_p.h - inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h - inputdeviceintegration/qwaylandinputdeviceintegrationplugin.cpp inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h - qtwaylandclientglobal.h qtwaylandclientglobal_p.h - qwaylandabstractdecoration.cpp qwaylandabstractdecoration_p.h - qwaylandbuffer.cpp qwaylandbuffer_p.h - qwaylanddecorationfactory.cpp qwaylanddecorationfactory_p.h - qwaylanddecorationplugin.cpp qwaylanddecorationplugin_p.h - qwaylanddisplay.cpp qwaylanddisplay_p.h - qwaylandextendedsurface.cpp qwaylandextendedsurface_p.h - qwaylandinputcontext.cpp qwaylandinputcontext_p.h - qwaylandinputdevice.cpp qwaylandinputdevice_p.h - qwaylandinputmethodcontext.cpp qwaylandinputmethodcontext_p.h - qwaylandintegration.cpp qwaylandintegration_p.h - qwaylandnativeinterface.cpp qwaylandnativeinterface_p.h - qwaylandqtkey.cpp qwaylandqtkey_p.h - qwaylandscreen.cpp qwaylandscreen_p.h - qwaylandshellsurface.cpp qwaylandshellsurface_p.h - qwaylandshm.cpp qwaylandshm_p.h - qwaylandshmbackingstore.cpp qwaylandshmbackingstore_p.h - 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 - shellintegration/qwaylandshellintegration_p.h - shellintegration/qwaylandshellintegrationfactory.cpp shellintegration/qwaylandshellintegrationfactory_p.h - shellintegration/qwaylandshellintegrationplugin.cpp shellintegration/qwaylandshellintegrationplugin_p.h - INCLUDE_DIRECTORIES - ../shared - global - hardwareintegration - inputdeviceintegration - shellintegration - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - 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 - ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-key-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-text-input-method-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-windowmanager.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/surface-extension.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/touch-extension.xml - ${CMAKE_CURRENT_SOURCE_DIR}/hardwareintegration/../../extensions/hardware-integration.xml - ${CMAKE_CURRENT_SOURCE_DIR}/hardwareintegration/../../extensions/server-buffer-extension.xml -) - -#### Keys ignored in scope 1:.:.:client.pro:<TRUE>: -# MODULE = "waylandclient" -# QMAKE_CXXFLAGS_WARN_ON = "--Wcast-qual" - -## Scopes: -##################################################################### - -qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon - PUBLIC_LIBRARIES - XKB::XKB -) - -qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard - SOURCES - qwaylandclipboard.cpp qwaylandclipboard_p.h -) - -qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan - SOURCES - qwaylandvulkaninstance.cpp qwaylandvulkaninstance_p.h - qwaylandvulkanwindow.cpp qwaylandvulkanwindow_p.h -) - -qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_cursor - SOURCES - qwaylandcursor.cpp qwaylandcursor_p.h - PUBLIC_LIBRARIES - Wayland::Cursor -) - -qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_datadevice - SOURCES - qwaylanddatadevice.cpp qwaylanddatadevice_p.h - qwaylanddatadevicemanager.cpp qwaylanddatadevicemanager_p.h - qwaylanddataoffer.cpp qwaylanddataoffer_p.h - qwaylanddatasource.cpp qwaylanddatasource_p.h -) - -qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_wayland_client_primary_selection - SOURCES - qwaylandprimaryselectionv1.cpp qwaylandprimaryselectionv1_p.h -) - -qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_draganddrop - SOURCES - qwaylanddnd.cpp qwaylanddnd_p.h -) diff --git a/src/client/client.pro b/src/client/client.pro deleted file mode 100644 index 5a071d9e..00000000 --- a/src/client/client.pro +++ /dev/null @@ -1,149 +0,0 @@ -TARGET = QtWaylandClient -MODULE = waylandclient - -QT += core-private gui-private - -# We have a bunch of C code with casts, so we can't have this option -QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual - -# Prevent gold linker from crashing. -# This started happening when QtPlatformSupport was modularized. -use_gold_linker: CONFIG += no_linker_version_script - -CONFIG -= precompile_header -CONFIG += link_pkgconfig wayland-scanner - -QMAKE_USE += wayland-client -qtConfig(xkbcommon): \ - QMAKE_USE += xkbcommon - -INCLUDEPATH += $$PWD/../shared - -WAYLANDCLIENTSOURCES += \ - ../extensions/surface-extension.xml \ - ../extensions/touch-extension.xml \ - ../extensions/qt-key-unstable-v1.xml \ - ../extensions/qt-windowmanager.xml \ - ../extensions/qt-text-input-method-unstable-v1.xml \ - ../3rdparty/protocol/wp-primary-selection-unstable-v1.xml \ - ../3rdparty/protocol/tablet-unstable-v2.xml \ - ../3rdparty/protocol/text-input-unstable-v2.xml \ - ../3rdparty/protocol/xdg-output-unstable-v1.xml \ - ../3rdparty/protocol/wayland.xml - -SOURCES += qwaylandintegration.cpp \ - qwaylandnativeinterface.cpp \ - qwaylandshmbackingstore.cpp \ - qwaylandinputdevice.cpp \ - qwaylanddisplay.cpp \ - qwaylandwindow.cpp \ - qwaylandscreen.cpp \ - qwaylandshmwindow.cpp \ - qwaylandshellsurface.cpp \ - qwaylandextendedsurface.cpp \ - qwaylandsubsurface.cpp \ - qwaylandsurface.cpp \ - qwaylandtabletv2.cpp \ - qwaylandtouch.cpp \ - qwaylandqtkey.cpp \ - ../shared/qwaylandmimehelper.cpp \ - ../shared/qwaylandinputmethodeventbuilder.cpp \ - qwaylandabstractdecoration.cpp \ - qwaylanddecorationfactory.cpp \ - qwaylanddecorationplugin.cpp \ - qwaylandwindowmanagerintegration.cpp \ - qwaylandinputcontext.cpp \ - qwaylandinputmethodcontext.cpp \ - qwaylandshm.cpp \ - qwaylandbuffer.cpp \ - -HEADERS += qwaylandintegration_p.h \ - qwaylandnativeinterface_p.h \ - qwaylanddisplay_p.h \ - qwaylandwindow_p.h \ - qwaylandscreen_p.h \ - qwaylandshmbackingstore_p.h \ - qwaylandinputdevice_p.h \ - qwaylandbuffer_p.h \ - qwaylandshmwindow_p.h \ - qwaylandshellsurface_p.h \ - qwaylandextendedsurface_p.h \ - qwaylandsubsurface_p.h \ - qwaylandsurface_p.h \ - qwaylandtabletv2_p.h \ - qwaylandtouch_p.h \ - qwaylandqtkey_p.h \ - qwaylandabstractdecoration_p.h \ - qwaylanddecorationfactory_p.h \ - qwaylanddecorationplugin_p.h \ - qwaylandwindowmanagerintegration_p.h \ - qwaylandinputcontext_p.h \ - qwaylandinputmethodcontext_p.h \ - qwaylandshm_p.h \ - qtwaylandclientglobal.h \ - qtwaylandclientglobal_p.h \ - ../shared/qwaylandinputmethodeventbuilder_p.h \ - ../shared/qwaylandmimehelper_p.h \ - ../shared/qwaylandsharedmemoryformathelper_p.h \ - -qtConfig(clipboard) { - HEADERS += qwaylandclipboard_p.h - SOURCES += qwaylandclipboard.cpp -} - -include(hardwareintegration/hardwareintegration.pri) -include(shellintegration/shellintegration.pri) -include(inputdeviceintegration/inputdeviceintegration.pri) -include(global/global.pri) - -qtConfig(vulkan) { - HEADERS += \ - qwaylandvulkaninstance_p.h \ - qwaylandvulkanwindow_p.h - - SOURCES += \ - qwaylandvulkaninstance.cpp \ - qwaylandvulkanwindow.cpp -} - -qtConfig(cursor) { - QMAKE_USE += wayland-cursor - - HEADERS += \ - qwaylandcursor_p.h - SOURCES += \ - qwaylandcursor.cpp -} - -qtConfig(wayland-datadevice) { - HEADERS += \ - qwaylanddatadevice_p.h \ - qwaylanddatadevicemanager_p.h \ - qwaylanddataoffer_p.h \ - qwaylanddatasource_p.h - SOURCES += \ - qwaylanddatadevice.cpp \ - qwaylanddatadevicemanager.cpp \ - qwaylanddataoffer.cpp \ - qwaylanddatasource.cpp -} - -qtConfig(wayland-client-primary-selection) { - HEADERS += qwaylandprimaryselectionv1_p.h - SOURCES += qwaylandprimaryselectionv1.cpp -} - -qtConfig(draganddrop) { - HEADERS += \ - qwaylanddnd_p.h - SOURCES += \ - qwaylanddnd.cpp -} - -CONFIG += generated_privates -MODULE_PLUGIN_TYPES = \ - wayland-graphics-integration-client \ - wayland-inputdevice-integration \ - wayland-decoration-client \ - wayland-shell-integration -load(qt_module) diff --git a/src/compositor/.prev_CMakeLists.txt b/src/compositor/.prev_CMakeLists.txt deleted file mode 100644 index c79764e2..00000000 --- a/src/compositor/.prev_CMakeLists.txt +++ /dev/null @@ -1,199 +0,0 @@ -# Generated from compositor.pro. - -##################################################################### -## WaylandCompositor Module: -##################################################################### - -qt_internal_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/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/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/qwaylandqttextinputmethod.cpp extensions/qwaylandqttextinputmethod.h extensions/qwaylandqttextinputmethod_p.h - extensions/qwaylandqttextinputmethodmanager.cpp extensions/qwaylandqttextinputmethodmanager.h extensions/qwaylandqttextinputmethodmanager_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/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/qwlqtkey.cpp extensions/qwlqtkey_p.h - extensions/qwlqttouch.cpp extensions/qwlqttouch_p.h - global/qtwaylandcompositorglobal.h - global/qtwaylandqmlinclude.h - global/qwaylandcompositorextension.cpp global/qwaylandcompositorextension.h global/qwaylandcompositorextension_p.h - global/qwaylandquickextension.h - global/qwaylandutils_p.h - hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_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.qsb" - "shaders/surface_rgba.frag.qsb" - "shaders/surface_rgbx.frag.qsb" - "shaders/surface_y_u_v.frag.qsb" - "shaders/surface_y_uv.frag.qsb" - "shaders/surface_y_xuxv.frag.qsb" -) - -qt_internal_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}/../extensions/hardware-integration.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-key-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-text-input-method-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-texture-sharing-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-windowmanager.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/server-buffer-extension.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/touch-extension.xml -) - -#### Keys ignored in scope 1:.:.:compositor.pro:<TRUE>: -# MODULE = "waylandcompositor" - -## Scopes: -##################################################################### - -qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl - SOURCES - 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_internal_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick - PUBLIC_LIBRARIES - Qt::Quick -) - -qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick - SOURCES - compositor_api/qwaylandcompositorquickextensions_p.h - compositor_api/qwaylandmousetracker.cpp compositor_api/qwaylandmousetracker_p.h - compositor_api/qwaylandquickchildren.h - 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 - 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 - LIBRARIES - Qt::QmlPrivate - Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Qml - Qt::Quick - PRIVATE_MODULE_INTERFACE - Qt::QmlPrivate - Qt::QuickPrivate -) - -#### Keys ignored in scope 4:.:.:compositor.pro:QT_FEATURE_wayland_compositor_quick: -# QMLTYPES_FILENAME = "plugins.qmltypes" -# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtWayland/Compositor" -# QML_IMPORT_NAME = "QtWayland.Compositor" -# QML_IMPORT_VERSION = "$$QT_VERSION" - -qt_internal_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_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon - PUBLIC_LIBRARIES - XKB::XKB -) - -qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_im - SOURCES - compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h -) - -qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_draganddrop - SOURCES - compositor_api/qwaylanddrag.cpp compositor_api/qwaylanddrag.h -) - -qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl AND QT_FEATURE_wayland_compositor_quick - SOURCES - compositor_api/qwaylandquickhardwarelayer.cpp compositor_api/qwaylandquickhardwarelayer_p.h - extensions/qwltexturesharingextension.cpp extensions/qwltexturesharingextension_p.h -) -qt_internal_add_docs(WaylandCompositor - doc/qtwaylandcompositor.qdocconf -) - diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro deleted file mode 100644 index 4fbbb2bc..00000000 --- a/src/compositor/compositor.pro +++ /dev/null @@ -1,47 +0,0 @@ -TARGET = QtWaylandCompositor -MODULE = waylandcompositor - -QT = core gui-private - -qtConfig(opengl): QT += opengl - -qtHaveModule(quick): QT += quick - -CONFIG -= precompile_header -CONFIG += link_pkgconfig - -QMAKE_DOCS = $$PWD/doc/qtwaylandcompositor.qdocconf - -QMAKE_USE += wayland-server - -INCLUDEPATH += ../shared - -HEADERS += ../shared/qwaylandmimehelper_p.h \ - ../shared/qwaylandinputmethodeventbuilder_p.h \ - ../shared/qwaylandsharedmemoryformathelper_p.h - -SOURCES += ../shared/qwaylandmimehelper.cpp \ - ../shared/qwaylandinputmethodeventbuilder.cpp - -RESOURCES += compositor.qrc - -include ($$PWD/global/global.pri) -include ($$PWD/wayland_wrapper/wayland_wrapper.pri) -include ($$PWD/hardware_integration/hardware_integration.pri) -include ($$PWD/compositor_api/compositor_api.pri) -include ($$PWD/extensions/extensions.pri) - -MODULE_PLUGIN_TYPES = \ - wayland-graphics-integration-server \ - wayland-hardware-layer-integration \ - -load(qt_module) - -qtConfig(wayland-compositor-quick) { - QMLTYPES_FILENAME = plugins.qmltypes - QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtWayland/Compositor - QML_IMPORT_NAME = QtWayland.Compositor - QML_IMPORT_VERSION = $$QT_VERSION - CONFIG += qmltypes install_qmltypes -} - diff --git a/src/imports/compositor-extensions/compositor-extensions.pro b/src/imports/compositor-extensions/compositor-extensions.pro deleted file mode 100644 index f5adf5ab..00000000 --- a/src/imports/compositor-extensions/compositor-extensions.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - xdgshell \ - iviapplication \ - wlshell diff --git a/src/imports/compositor-extensions/iviapplication/iviapplication.pro b/src/imports/compositor-extensions/iviapplication/iviapplication.pro deleted file mode 100644 index 230a3408..00000000 --- a/src/imports/compositor-extensions/iviapplication/iviapplication.pro +++ /dev/null @@ -1,11 +0,0 @@ -CXX_MODULE = qml -TARGET = qwaylandcompositoriviapplicationplugin -TARGETPATH = QtWayland/Compositor/IviApplication -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - qwaylandcompositoriviapplicationplugin.cpp - -QT += waylandcompositor - -load(qml_plugin) diff --git a/src/imports/compositor-extensions/wlshell/wlshell.pro b/src/imports/compositor-extensions/wlshell/wlshell.pro deleted file mode 100644 index 30d0201f..00000000 --- a/src/imports/compositor-extensions/wlshell/wlshell.pro +++ /dev/null @@ -1,11 +0,0 @@ -CXX_MODULE = qml -TARGET = qwaylandcompositorwlshellplugin -TARGETPATH = QtWayland/Compositor/WlShell -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - qwaylandcompositorwlshellplugin.cpp - -QT += waylandcompositor - -load(qml_plugin) diff --git a/src/imports/compositor-extensions/xdgshell/xdgshell.pro b/src/imports/compositor-extensions/xdgshell/xdgshell.pro deleted file mode 100644 index 0afcb76c..00000000 --- a/src/imports/compositor-extensions/xdgshell/xdgshell.pro +++ /dev/null @@ -1,11 +0,0 @@ -CXX_MODULE = qml -TARGET = qwaylandcompositorxdgshellplugin -TARGETPATH = QtWayland/Compositor/XdgShell -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - qwaylandcompositorxdgshellplugin.cpp - -QT += waylandcompositor - -load(qml_plugin) diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro deleted file mode 100644 index cb3fcbca..00000000 --- a/src/imports/compositor/compositor.pro +++ /dev/null @@ -1,20 +0,0 @@ -CXX_MODULE = qml -TARGET = qwaylandcompositorplugin -TARGETPATH = QtWayland/Compositor -QMl_IMPORT_NAME = QtWayland.Compositor -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - qwaylandquickcompositorplugin.cpp - -QML_FILES += \ - $$PWD/WaylandOutputWindow.qml \ - $$PWD/WaylandCursorItem.qml - -OTHER_FILES += \ - qmldir \ - $$QML_FILES - -QT += quick-private qml-private gui-private core-private waylandcompositor waylandcompositor-private -CONFIG += install_qml_files -load(qml_plugin) diff --git a/src/imports/imports.pro b/src/imports/imports.pro deleted file mode 100644 index 4fd2fe77..00000000 --- a/src/imports/imports.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = subdirs - -qtHaveModule(quick):qtHaveModule(waylandcompositor) { - SUBDIRS += \ - compositor \ - compositor-extensions - - qtConfig(opengl):qtHaveModule(waylandclient) { - SUBDIRS += \ - texture-sharing \ - texture-sharing-extension - } -} diff --git a/src/imports/texture-sharing-extension/texture-sharing-extension.pro b/src/imports/texture-sharing-extension/texture-sharing-extension.pro deleted file mode 100644 index 68a8cf75..00000000 --- a/src/imports/texture-sharing-extension/texture-sharing-extension.pro +++ /dev/null @@ -1,11 +0,0 @@ -CXX_MODULE = qml -TARGET = qwaylandtexturesharingextension -TARGETPATH = QtWayland/Compositor/TextureSharingExtension -IMPORT_VERSION = 1.$$QT_MINOR_VERSION - -SOURCES += \ - plugin.cpp - -QT += quick-private qml gui-private core-private waylandcompositor waylandcompositor-private - -load(qml_plugin) diff --git a/src/imports/texture-sharing/texture-sharing.pro b/src/imports/texture-sharing/texture-sharing.pro deleted file mode 100644 index 9ff39d63..00000000 --- a/src/imports/texture-sharing/texture-sharing.pro +++ /dev/null @@ -1,21 +0,0 @@ -CXX_MODULE = qml -TARGET = qwaylandtexturesharing -TARGETPATH = QtWayland/Client/TextureSharing -IMPORT_VERSION = 1.$$QT_MINOR_VERSION - -HEADERS += \ - sharedtextureprovider.h \ - texturesharingextension.h - -SOURCES += \ - plugin.cpp \ - sharedtextureprovider.cpp \ - texturesharingextension.cpp - -QT += quick-private qml gui-private core-private waylandclient waylandclient-private opengl -CONFIG += wayland-scanner - -WAYLANDCLIENTSOURCES += ../../extensions/qt-texture-sharing-unstable-v1.xml - - -load(qml_plugin) diff --git a/src/plugins/decorations/bradient/bradient.pro b/src/plugins/decorations/bradient/bradient.pro deleted file mode 100644 index e3157678..00000000 --- a/src/plugins/decorations/bradient/bradient.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -OTHER_FILES += \ - bradient.json - -SOURCES += main.cpp - -QMAKE_USE += wayland-client - -PLUGIN_TYPE = wayland-decoration-client -PLUGIN_CLASS_NAME = QWaylandBradientDecorationPlugin -load(qt_plugin) diff --git a/src/plugins/decorations/decorations.pro b/src/plugins/decorations/decorations.pro deleted file mode 100644 index 6d51a450..00000000 --- a/src/plugins/decorations/decorations.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - bradient diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro deleted file mode 100644 index c2e9ad4f..00000000 --- a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../../hardwareintegration/client/brcm-egl/brcm-egl.pri) - -OTHER_FILES += \ - brcm-egl.json - -SOURCES += main.cpp - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = QWaylandBrcmEglClientBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro deleted file mode 100644 index 7b7e8a49..00000000 --- a/src/plugins/hardwareintegration/client/client.pro +++ /dev/null @@ -1,22 +0,0 @@ -TEMPLATE=subdirs -QT_FOR_CONFIG += waylandclient-private - -qtConfig(wayland-egl): \ - SUBDIRS += wayland-egl -qtConfig(wayland-brcm): \ - SUBDIRS += brcm-egl -qtConfig(xcomposite-egl): \ - SUBDIRS += xcomposite-egl -qtConfig(xcomposite-glx): \ - SUBDIRS += xcomposite-glx - -qtConfig(wayland-drm-egl-server-buffer): \ - SUBDIRS += drm-egl-server -qtConfig(wayland-libhybris-egl-server-buffer): \ - SUBDIRS += libhybris-egl-server -qtConfig(wayland-shm-emulation-server-buffer): \ - SUBDIRS += shm-emulation-server -qtConfig(wayland-dmabuf-server-buffer): \ - SUBDIRS += dmabuf-server -qtConfig(wayland-vulkan-server-buffer): \ - SUBDIRS += vulkan-server diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/dmabuf-server.pro b/src/plugins/hardwareintegration/client/dmabuf-server/dmabuf-server.pro deleted file mode 100644 index 3c91b2ec..00000000 --- a/src/plugins/hardwareintegration/client/dmabuf-server/dmabuf-server.pro +++ /dev/null @@ -1,15 +0,0 @@ -# We have a bunch of C code with casts, so we can't have this option -QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual - -QT += waylandclient-private opengl - -include(../../../../hardwareintegration/client/dmabuf-server/dmabuf-server.pri) - -OTHER_FILES += \ - dmabuf-server.json - -SOURCES += main.cpp - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = DmaBufServerBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro deleted file mode 100644 index 390278b1..00000000 --- a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro +++ /dev/null @@ -1,15 +0,0 @@ -# We have a bunch of C code with casts, so we can't have this option -QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual - -QT += waylandclient-private opengl - -include(../../../../hardwareintegration/client/drm-egl-server/drm-egl-server.pri) - -OTHER_FILES += \ - drm-egl-server.json - -SOURCES += main.cpp - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = DrmEglServerBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro deleted file mode 100644 index 3193b8f6..00000000 --- a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../../hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pri) - -OTHER_FILES += \ - libhybris-egl-server.json - -SOURCES += main.cpp - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = LibHybrisEglServerBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/shm-emulation-server.pro b/src/plugins/hardwareintegration/client/shm-emulation-server/shm-emulation-server.pro deleted file mode 100644 index 9e9319d2..00000000 --- a/src/plugins/hardwareintegration/client/shm-emulation-server/shm-emulation-server.pro +++ /dev/null @@ -1,15 +0,0 @@ -# We have a bunch of C code with casts, so we can't have this option -QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual - -QT += waylandclient-private opengl - -include(../../../../hardwareintegration/client/shm-emulation-server/shm-emulation-server.pri) - -OTHER_FILES += \ - shm-emulation-server.json - -SOURCES += main.cpp - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = ShmServerBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/vulkan-server/vulkan-server.pro b/src/plugins/hardwareintegration/client/vulkan-server/vulkan-server.pro deleted file mode 100644 index 13cb2ab9..00000000 --- a/src/plugins/hardwareintegration/client/vulkan-server/vulkan-server.pro +++ /dev/null @@ -1,15 +0,0 @@ -# We have a bunch of C code with casts, so we can't have this option -QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual - -QT += waylandclient-private opengl - -include(../../../../hardwareintegration/client/vulkan-server/vulkan-server.pri) - -OTHER_FILES += \ - vulkan-server.json - -SOURCES += main.cpp - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = VulkanServerBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/wayland-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/.prev_CMakeLists.txt deleted file mode 100644 index b1732b01..00000000 --- a/src/plugins/hardwareintegration/client/wayland-egl/.prev_CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Generated from wayland-egl.pro. - -##################################################################### -## QWaylandEglClientBufferPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandEglClientBufferPlugin - OUTPUT_NAME qt-plugin-wayland-egl - TYPE wayland-graphics-integration-client - SOURCES - ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h - ../../../../hardwareintegration/client/wayland-egl/qwaylandeglinclude.h - ../../../../hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandeglwindow.h - ../../../../hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandglcontext.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/client/wayland-egl - PUBLIC_LIBRARIES - ${CMAKE_DL_LIBS} - EGL::EGL - Qt::Core - Qt::Gui - Qt::OpenGLPrivate - Qt::WaylandClientPrivate - Wayland::Client - Wayland::Egl -) - -#### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>: -# OTHER_FILES = "wayland-egl.json" diff --git a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro deleted file mode 100644 index 409cd37d..00000000 --- a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT += waylandclient-private - -include(../../../../hardwareintegration/client/wayland-egl/wayland-egl.pri) - -OTHER_FILES += \ - wayland-egl.json - -SOURCES += main.cpp - -TARGET = qt-plugin-wayland-egl - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = QWaylandEglClientBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/.prev_CMakeLists.txt deleted file mode 100644 index f575d44e..00000000 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/.prev_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Generated from xcomposite-egl.pro. - -##################################################################### -## QWaylandXCompositeEglClientBufferPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin - OUTPUT_NAME xcomposite-egl - TYPE wayland-graphics-integration-client - 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 - ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp ../../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h - ../../../../hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp ../../../../hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/client/xcomposite-egl - ../../../../hardwareintegration/client/xcomposite_share - PUBLIC_LIBRARIES - EGL::EGL - PkgConfig::XComposite - Qt::Core - Qt::Gui - Qt::WaylandClientPrivate - Wayland::Client - X11::X11 -) - -qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeEglClientBufferPlugin - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml -) - -#### Keys ignored in scope 1:.:.:xcomposite-egl.pro:<TRUE>: -# OTHER_FILES = "xcomposite-egl.json" -# QMAKE_CXXFLAGS_WARN_ON = "--Wcast-qual" diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro deleted file mode 100644 index 83bd4fe8..00000000 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro +++ /dev/null @@ -1,15 +0,0 @@ -# We have a bunch of C code with casts, so we can't have this option -QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual - -QT += waylandclient-private - -include(../../../../hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri) - -OTHER_FILES += xcomposite-egl.json - -SOURCES += \ - main.cpp - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = QWaylandXCompositeEglClientBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro deleted file mode 100644 index 804ca386..00000000 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri) - -OTHER_FILES += xcomposite-glx.json - -SOURCES += \ - main.cpp - -PLUGIN_TYPE = wayland-graphics-integration-client -PLUGIN_CLASS_NAME = QWaylandXCompositeGlxClientBufferPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro deleted file mode 100644 index c89ecec0..00000000 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += brcm-egl.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-brcm-egl - -include(../../../../hardwareintegration/compositor/brcm-egl/brcm-egl.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandBrcmClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro deleted file mode 100644 index 32edf1f1..00000000 --- a/src/plugins/hardwareintegration/compositor/compositor.pro +++ /dev/null @@ -1,30 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += waylandcompositor-private - -qtConfig(wayland-dmabuf-client-buffer): \ - SUBDIRS += linux-dmabuf-unstable-v1 -qtConfig(wayland-egl): \ - SUBDIRS += wayland-egl -qtConfig(wayland-brcm): \ - SUBDIRS += brcm-egl -qtConfig(xcomposite-egl): \ - SUBDIRS += xcomposite-egl -qtConfig(xcomposite-glx): \ - SUBDIRS += xcomposite-glx - -qtConfig(wayland-drm-egl-server-buffer): \ - SUBDIRS += drm-egl-server -qtConfig(wayland-libhybris-egl-server-buffer): \ - SUBDIRS += libhybris-egl-server -qtConfig(wayland-shm-emulation-server-buffer): \ - SUBDIRS += shm-emulation-server -qtConfig(wayland-dmabuf-server-buffer): \ - SUBDIRS += dmabuf-server -qtConfig(wayland-vulkan-server-buffer): \ - SUBDIRS += vulkan-server - -qtConfig(wayland-egl): \ - SUBDIRS += wayland-eglstream-controller - - -SUBDIRS += hardwarelayer diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro b/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro deleted file mode 100644 index d96e5813..00000000 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += dmabuf-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-dmabuf-server-buffer - -include(../../../../hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = DmaBufServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro deleted file mode 100644 index 2ba17c38..00000000 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += drm-egl-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-drm-egl-server-buffer - -include(../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = DrmEglServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/hardwarelayer.pro b/src/plugins/hardwareintegration/compositor/hardwarelayer/hardwarelayer.pro deleted file mode 100644 index 634447af..00000000 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/hardwarelayer.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += waylandcompositor-private - -qtConfig(wayland-layer-integration-vsp2): \ - SUBDIRS += vsp2 diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro deleted file mode 100644 index c18884a9..00000000 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro +++ /dev/null @@ -1,16 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -QMAKE_USE_PRIVATE += wayland-kms - -OTHER_FILES += vsp2.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-vsp2 - -include(../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pri) - -PLUGIN_TYPE = wayland-hardware-layer-integration -PLUGIN_CLASS_NAME = Vsp2HardwareLayerIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro deleted file mode 100644 index c9c3a0da..00000000 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += libhybris-egl-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-libybris-egl-server.json - -include(../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = LibHybrisEglServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pro b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pro deleted file mode 100644 index 1f76f9f0..00000000 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += linux-dmabuf.json - -SOURCES += \ - main.cpp \ - -TARGET = qt-wayland-compositor-linux-dmabuf-unstable-v1 - -include(../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandDmabufClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro b/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro deleted file mode 100644 index 865af1a7..00000000 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += shm-emulation-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-shm-emulation-server - -include(../../../../hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = ShmServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro b/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro deleted file mode 100644 index dc82c3f2..00000000 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += vulkan-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-vulkan-server - -include(../../../../hardwareintegration/compositor/vulkan-server/vulkan-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = VulkanServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt deleted file mode 100644 index ebaf1ee1..00000000 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Generated from wayland-egl.pro. - -##################################################################### -## QWaylandEglClientBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-wayland-egl - TYPE wayland-graphics-integration-server - SOURCES - ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/wayland-egl - LIBRARIES - EGL::EGL - Wayland::Egl - Wayland::Server - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositor - Qt::WaylandCompositorPrivate -) - -#### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>: -# OTHER_FILES = "wayland-egl.json" diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro deleted file mode 100644 index d452220c..00000000 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += wayland-egl.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-wayland-egl - -include(../../../../hardwareintegration/compositor/wayland-egl/wayland-egl.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandEglClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt deleted file mode 100644 index dac26fe7..00000000 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Generated from wayland-eglstream-controller.pro. - -##################################################################### -## QWaylandEglStreamClientBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandEglStreamClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller - TYPE wayland-graphics-integration-server - 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 - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/wayland-eglstream-controller - LIBRARIES - EGL::EGL - Wayland::Egl - Wayland::Server - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositor - Qt::WaylandCompositorPrivate -) - -qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamClientBufferIntegrationPlugin - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml -) - -#### Keys ignored in scope 1:.:.:wayland-eglstream-controller.pro:<TRUE>: -# OTHER_FILES = "wayland-eglstream-controller.json" diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro deleted file mode 100644 index 0d1bfb0e..00000000 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += wayland-eglstream-controller.json - -SOURCES += \ - main.cpp \ - -TARGET = qt-wayland-compositor-wayland-eglstream-controller - -include(../../../../hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandEglStreamClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt deleted file mode 100644 index 2492b259..00000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Generated from xcomposite-egl.pro. - -##################################################################### -## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-xcomposite-egl - TYPE wayland-graphics-integration-server - 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 - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h - ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/xcomposite-egl - ../../../../hardwareintegration/compositor/xcomposite_share - LIBRARIES - EGL::EGL - 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(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 -) - -#### Keys ignored in scope 1:.:.:xcomposite-egl.pro:<TRUE>: -# OTHER_FILES = "xcomposite-egl.json" diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro deleted file mode 100644 index 298ed2fc..00000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT += waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += xcomposite-egl.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-xcomposite-egl - -include(../../../../hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandXCompositeEglClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt deleted file mode 100644 index c32b25ba..00000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from xcomposite-glx.pro. - -##################################################################### -## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-xcomposite-glx - TYPE wayland-graphics-integration-server - 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 - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h - ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/xcomposite-glx - ../../../../hardwareintegration/compositor/xcomposite_share - LIBRARIES - 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(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 -) - -#### Keys ignored in scope 1:.:.:xcomposite-glx.pro:<TRUE>: -# OTHER_FILES = "xcomposite-glx.json" diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro deleted file mode 100644 index 41e5c2ec..00000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT += waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += xcomposite-glx.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-xcomposite-glx - -include(../../../../hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandXCompositeGlxClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/hardwareintegration.pro b/src/plugins/hardwareintegration/hardwareintegration.pro deleted file mode 100644 index 12658adf..00000000 --- a/src/plugins/hardwareintegration/hardwareintegration.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE=subdirs - -qtHaveModule(waylandclient): SUBDIRS += client -qtHaveModule(waylandcompositor): SUBDIRS += compositor diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro deleted file mode 100644 index ec589ae8..00000000 --- a/src/plugins/platforms/platforms.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE=subdirs -CONFIG+=ordered -QT_FOR_CONFIG += waylandclient-private - -SUBDIRS += qwayland-generic - -qtConfig(wayland-egl): \ - SUBDIRS += qwayland-egl - -#The following integrations are only useful with QtWaylandCompositor -qtConfig(wayland-brcm): \ - SUBDIRS += qwayland-brcm-egl - -qtConfig(xcomposite-egl): \ - SUBDIRS += qwayland-xcomposite-egl -qtConfig(xcomposite-glx): \ - SUBDIRS += qwayland-xcomposite-glx diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro b/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro deleted file mode 100644 index 6455aa31..00000000 --- a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../hardwareintegration/client/brcm-egl/brcm-egl.pri) - -OTHER_FILES += \ - qwayland-brcm-egl.json - -SOURCES += main.cpp - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandBrcmEglPlatformIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-egl/.prev_CMakeLists.txt b/src/plugins/platforms/qwayland-egl/.prev_CMakeLists.txt deleted file mode 100644 index e9e5e0b1..00000000 --- a/src/plugins/platforms/qwayland-egl/.prev_CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Generated from qwayland-egl.pro. - -##################################################################### -## QWaylandEglPlatformIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandEglPlatformIntegrationPlugin - OUTPUT_NAME qwayland-egl - TYPE platforms - SOURCES - ../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp ../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h - ../../../hardwareintegration/client/wayland-egl/qwaylandeglinclude.h - ../../../hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp ../../../hardwareintegration/client/wayland-egl/qwaylandeglwindow.h - ../../../hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp ../../../hardwareintegration/client/wayland-egl/qwaylandglcontext.h - main.cpp - INCLUDE_DIRECTORIES - ../../../hardwareintegration/client/wayland-egl - PUBLIC_LIBRARIES - ${CMAKE_DL_LIBS} - EGL::EGL - Qt::Core - Qt::Gui - Qt::OpenGLPrivate - Qt::WaylandClientPrivate - Wayland::Client - Wayland::Egl -) - -#### Keys ignored in scope 1:.:.:qwayland-egl.pro:<TRUE>: -# OTHER_FILES = "qwayland-egl.json" diff --git a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro deleted file mode 100644 index 9ac050da..00000000 --- a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../hardwareintegration/client/wayland-egl/wayland-egl.pri) - -OTHER_FILES += \ - qwayland-egl.json - -SOURCES += main.cpp - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandEglPlatformIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt b/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt deleted file mode 100644 index 6fe5c246..00000000 --- a/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Generated from qwayland-generic.pro. - -##################################################################### -## QWaylandIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandIntegrationPlugin - OUTPUT_NAME qwayland-generic - TYPE platforms - SOURCES - main.cpp - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::WaylandClientPrivate -) - -#### Keys ignored in scope 1:.:.:qwayland-generic.pro:<TRUE>: -# OTHER_FILES = "qwayland-generic.json" diff --git a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro b/src/plugins/platforms/qwayland-generic/qwayland-generic.pro deleted file mode 100644 index bfeab3fe..00000000 --- a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro +++ /dev/null @@ -1,10 +0,0 @@ -QT += waylandclient-private - -OTHER_FILES += \ - qwayland-generic.json - -SOURCES += main.cpp - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/.prev_CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-egl/.prev_CMakeLists.txt deleted file mode 100644 index 59382cc0..00000000 --- a/src/plugins/platforms/qwayland-xcomposite-egl/.prev_CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -# Generated from qwayland-xcomposite-egl.pro. - -##################################################################### -## QWaylandXCompositeEglPlatformIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin - OUTPUT_NAME qwayland-xcomposite-egl - TYPE platforms - 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 - ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h - ../../../hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp ../../../hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h - main.cpp - INCLUDE_DIRECTORIES - ../../../hardwareintegration/client/xcomposite-egl - ../../../hardwareintegration/client/xcomposite_share - PUBLIC_LIBRARIES - EGL::EGL - PkgConfig::XComposite - Qt::Core - Qt::Gui - Qt::WaylandClientPrivate - Wayland::Client - X11::X11 -) - -qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeEglPlatformIntegrationPlugin - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml -) - -#### Keys ignored in scope 1:.:.:qwayland-xcomposite-egl.pro:<TRUE>: -# OTHER_FILES = "qwayland-xcomposite-egl.json" diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro deleted file mode 100644 index 55246039..00000000 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri) - -OTHER_FILES += qwayland-xcomposite-egl.json - -SOURCES += \ - main.cpp - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandXCompositeEglPlatformIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro deleted file mode 100644 index 899d939b..00000000 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro +++ /dev/null @@ -1,15 +0,0 @@ -QT += waylandclient-private - -include(../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri) - -OTHER_FILES += qwayland-xcomposite-glx.json - -SOURCES += \ - main.cpp - -HEADERS += \ - qwaylandxcompositeglxplatformintegration.h - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandXCompositeGlxPlatformIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index e121d92d..00000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE=subdirs - -qtHaveModule(waylandclient) { - SUBDIRS += \ - platforms \ - decorations \ - shellintegration -} - -SUBDIRS += \ - hardwareintegration diff --git a/src/plugins/shellintegration/fullscreen-shell-v1/fullscreen-shell-v1.pro b/src/plugins/shellintegration/fullscreen-shell-v1/fullscreen-shell-v1.pro deleted file mode 100644 index a522f87a..00000000 --- a/src/plugins/shellintegration/fullscreen-shell-v1/fullscreen-shell-v1.pro +++ /dev/null @@ -1,23 +0,0 @@ -QT += gui-private waylandclient-private -CONFIG += wayland-scanner - -QMAKE_USE += wayland-client - -WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/fullscreen-shell-unstable-v1.xml - -HEADERS += \ - qwaylandfullscreenshellv1integration.h \ - qwaylandfullscreenshellv1surface.h - -SOURCES += \ - main.cpp \ - qwaylandfullscreenshellv1integration.cpp \ - qwaylandfullscreenshellv1surface.cpp - -OTHER_FILES += \ - fullscreen-shell-v1.json - -PLUGIN_TYPE = wayland-shell-integration -PLUGIN_CLASS_NAME = QWaylandFullScreenShellV1IntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro deleted file mode 100644 index 67e659ab..00000000 --- a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro +++ /dev/null @@ -1,27 +0,0 @@ -QT += gui-private waylandclient-private -CONFIG += wayland-scanner - -QMAKE_USE += wayland-client - -qtConfig(xkbcommon): \ - QMAKE_USE += xkbcommon - -WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/ivi-application.xml \ - ../../../3rdparty/protocol/ivi-controller.xml - -HEADERS += \ - qwaylandivishellintegration.h \ - qwaylandivisurface_p.h - -SOURCES += \ - main.cpp \ - qwaylandivishellintegration.cpp \ - qwaylandivisurface.cpp - -OTHER_FILES += \ - ivi-shell.json - -PLUGIN_TYPE = wayland-shell-integration -PLUGIN_CLASS_NAME = QWaylandIviShellIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/shellintegration/shellintegration.pro b/src/plugins/shellintegration/shellintegration.pro deleted file mode 100644 index 8cfad2d4..00000000 --- a/src/plugins/shellintegration/shellintegration.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += waylandclient-private - -qtConfig(wayland-client-fullscreen-shell-v1): SUBDIRS += fullscreen-shell-v1 -qtConfig(wayland-client-ivi-shell): SUBDIRS += ivi-shell -qtConfig(wayland-client-wl-shell): SUBDIRS += wl-shell -qtConfig(wayland-client-xdg-shell): SUBDIRS += xdg-shell diff --git a/src/plugins/shellintegration/wl-shell/wl-shell.pro b/src/plugins/shellintegration/wl-shell/wl-shell.pro deleted file mode 100644 index bb2c1829..00000000 --- a/src/plugins/shellintegration/wl-shell/wl-shell.pro +++ /dev/null @@ -1,25 +0,0 @@ -QT += gui-private waylandclient-private -CONFIG += wayland-scanner - -QMAKE_USE += wayland-client -qtConfig(xkbcommon): \ - QMAKE_USE_PRIVATE += xkbcommon - -WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/wayland.xml - -HEADERS += \ - qwaylandwlshellintegration_p.h \ - qwaylandwlshellsurface_p.h \ - -SOURCES += \ - main.cpp \ - qwaylandwlshellintegration.cpp \ - qwaylandwlshellsurface.cpp \ - -OTHER_FILES += \ - wl-shell.json - -PLUGIN_TYPE = wayland-shell-integration -PLUGIN_CLASS_NAME = QWaylandWlShellIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro b/src/plugins/shellintegration/xdg-shell/xdg-shell.pro deleted file mode 100644 index 26171584..00000000 --- a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro +++ /dev/null @@ -1,28 +0,0 @@ -QT += gui-private waylandclient-private -CONFIG += wayland-scanner - -QMAKE_USE += wayland-client -qtConfig(xkbcommon): \ - QMAKE_USE_PRIVATE += xkbcommon - -WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml \ - ../../../3rdparty/protocol/xdg-shell.xml - -HEADERS += \ - qwaylandxdgdecorationv1_p.h \ - qwaylandxdgshell_p.h \ - qwaylandxdgshellintegration_p.h \ - -SOURCES += \ - main.cpp \ - qwaylandxdgdecorationv1.cpp \ - qwaylandxdgshell.cpp \ - qwaylandxdgshellintegration.cpp \ - -OTHER_FILES += \ - xdg-shell.json - -PLUGIN_TYPE = wayland-shell-integration -PLUGIN_CLASS_NAME = QWaylandXdgShellIntegrationPlugin -load(qt_plugin) diff --git a/src/qtwaylandscanner/.prev_CMakeLists.txt b/src/qtwaylandscanner/.prev_CMakeLists.txt deleted file mode 100644 index 156ef030..00000000 --- a/src/qtwaylandscanner/.prev_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Generated from qtwaylandscanner.pro. - -##################################################################### -## qtwaylandscanner Tool: -##################################################################### - -qt_get_tool_target_name(target_name qtwaylandscanner) -qt_internal_add_tool(${target_name} - SOURCES - qtwaylandscanner.cpp -) - -#### Keys ignored in scope 1:.:.:qtwaylandscanner.pro:<TRUE>: -# _OPTION = "host_build" diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro deleted file mode 100644 index cad7bbfb..00000000 --- a/src/qtwaylandscanner/qtwaylandscanner.pro +++ /dev/null @@ -1,7 +0,0 @@ -option(host_build) - -SOURCES += qtwaylandscanner.cpp -QT = core - -load(qt_tool) - diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index e2f4124b..00000000 --- a/src/src.pro +++ /dev/null @@ -1,27 +0,0 @@ -TEMPLATE=subdirs -include($$OUT_PWD/client/qtwaylandclient-config.pri) -include($$OUT_PWD/compositor/qtwaylandcompositor-config.pri) -QT_FOR_CONFIG += waylandclient-private waylandcompositor-private - -qtConfig(wayland-client)|qtConfig(wayland-server) { - SUBDIRS += qtwaylandscanner - - qtConfig(wayland-client) { - client.depends = qtwaylandscanner - SUBDIRS += client - } - - plugins.depends += qtwaylandscanner - qtConfig(wayland-client):plugins.depends += client - qtConfig(wayland-server):plugins.depends += compositor - SUBDIRS += plugins - - qtConfig(wayland-server) { - compositor.depends = qtwaylandscanner - SUBDIRS += compositor - } - - qtConfig(wayland-client):imports.depends += client - qtConfig(wayland-server):imports.depends += compositor - SUBDIRS += imports -} diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt deleted file mode 100644 index 22141371..00000000 --- a/tests/.prev_CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Generated from tests.pro. - -if(QT_BUILD_STANDALONE_TESTS) - # Add qt_find_package calls for extra dependencies that need to be found when building - # the standalone tests here. -endif() -qt_build_tests() diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt deleted file mode 100644 index 15a50eb6..00000000 --- a/tests/auto/.prev_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Generated from auto.pro. - -if(TARGET Qt::WaylandClient) - add_subdirectory(client) -endif() -if(TARGET Qt::WaylandClient AND TARGET Qt::WaylandCompositor) - add_subdirectory(cmake) -endif() -if(TARGET Qt::WaylandCompositor) - add_subdirectory(compositor) -endif() diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index 032ae47a..00000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE=subdirs -QT_FOR_CONFIG += waylandclient-private - -qtHaveModule(waylandclient): \ - SUBDIRS += client - -qtHaveModule(waylandclient):qtHaveModule(waylandcompositor): \ - SUBDIRS += cmake - -qtHaveModule(waylandcompositor): \ - SUBDIRS += compositor diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro deleted file mode 100644 index 7f5ffc0f..00000000 --- a/tests/auto/client/client.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE=subdirs - -SUBDIRS += \ - client \ - datadevicev1 \ - fullscreenshellv1 \ - iviapplication \ - nooutput \ - output \ - primaryselectionv1 \ - seatv4 \ - seatv5 \ - surface \ - tabletv2 \ - wl_connect \ - xdgdecorationv1 \ - xdgoutput \ - xdgshell - -qtConfig(im): SUBDIRS += inputcontext diff --git a/tests/auto/client/client/.prev_CMakeLists.txt b/tests/auto/client/client/.prev_CMakeLists.txt deleted file mode 100644 index 0aeb3f27..00000000 --- a/tests/auto/client/client/.prev_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from client.pro. - -##################################################################### -## tst_client Test: -##################################################################### - -qt_internal_add_test(tst_client - SOURCES - ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h - ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h - ../shared_old/mockinput.cpp ../shared_old/mockinput.h - ../shared_old/mockiviapplication.cpp ../shared_old/mockiviapplication.h - ../shared_old/mockoutput.cpp ../shared_old/mockoutput.h - ../shared_old/mockregion.cpp ../shared_old/mockregion.h - ../shared_old/mocksurface.cpp ../shared_old/mocksurface.h - ../shared_old/mockwlshell.cpp ../shared_old/mockwlshell.h - tst_client.cpp - INCLUDE_DIRECTORIES - ../shared_old - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Client - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_client - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/fullscreen-shell-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/ivi-application.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/wayland.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/xdg-shell.xml -) - -#### Keys ignored in scope 1:.:.:client.pro:<TRUE>: -# check.commands = "$(TESTRUNNER)" "$${PWD}/run-with-all-shells.sh" "$(TESTARGS)" diff --git a/tests/auto/client/client/client.pro b/tests/auto/client/client/client.pro deleted file mode 100644 index 7c3a934d..00000000 --- a/tests/auto/client/client/client.pro +++ /dev/null @@ -1,6 +0,0 @@ -include (../shared_old/shared_old.pri) - -TARGET = tst_client -SOURCES += tst_client.cpp - -check.commands = $(TESTRUNNER) $${PWD}/run-with-all-shells.sh $(TESTARGS) diff --git a/tests/auto/client/datadevicev1/.prev_CMakeLists.txt b/tests/auto/client/datadevicev1/.prev_CMakeLists.txt deleted file mode 100644 index 6a1060b3..00000000 --- a/tests/auto/client/datadevicev1/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from datadevicev1.pro. - -##################################################################### -## tst_datadevicev1 Test: -##################################################################### - -qt_internal_add_test(tst_datadevicev1 - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_datadevicev1.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_datadevicev1 - 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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/datadevicev1/datadevicev1.pro b/tests/auto/client/datadevicev1/datadevicev1.pro deleted file mode 100644 index b3c687c4..00000000 --- a/tests/auto/client/datadevicev1/datadevicev1.pro +++ /dev/null @@ -1,4 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_datadevicev1 -SOURCES += tst_datadevicev1.cpp diff --git a/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt b/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt deleted file mode 100644 index ca850796..00000000 --- a/tests/auto/client/fullscreenshellv1/.prev_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Generated from fullscreenshellv1.pro. - -##################################################################### -## tst_client_fullscreenshellv1 Test: -##################################################################### - -qt_internal_add_test(tst_client_fullscreenshellv1 - SOURCES - ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h - ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h - ../shared_old/mockinput.cpp ../shared_old/mockinput.h - ../shared_old/mockiviapplication.cpp ../shared_old/mockiviapplication.h - ../shared_old/mockoutput.cpp ../shared_old/mockoutput.h - ../shared_old/mockregion.cpp ../shared_old/mockregion.h - ../shared_old/mocksurface.cpp ../shared_old/mocksurface.h - ../shared_old/mockwlshell.cpp ../shared_old/mockwlshell.h - tst_fullscreenshellv1.cpp - INCLUDE_DIRECTORIES - ../shared_old - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Client - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_client_fullscreenshellv1 - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/fullscreen-shell-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/ivi-application.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/wayland.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro b/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro deleted file mode 100644 index c4006cdd..00000000 --- a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro +++ /dev/null @@ -1,4 +0,0 @@ -include (../shared_old/shared_old.pri) - -TARGET = tst_client_fullscreenshellv1 -SOURCES += tst_fullscreenshellv1.cpp diff --git a/tests/auto/client/inputcontext/.prev_CMakeLists.txt b/tests/auto/client/inputcontext/.prev_CMakeLists.txt deleted file mode 100644 index 2d278392..00000000 --- a/tests/auto/client/inputcontext/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from inputcontext.pro. - -##################################################################### -## tst_inputcontext Test: -##################################################################### - -qt_internal_add_test(tst_inputcontext - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_inputcontext.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_inputcontext - 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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/inputcontext/inputcontext.pro b/tests/auto/client/inputcontext/inputcontext.pro deleted file mode 100644 index 1971d455..00000000 --- a/tests/auto/client/inputcontext/inputcontext.pro +++ /dev/null @@ -1,4 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_inputcontext -SOURCES += tst_inputcontext.cpp diff --git a/tests/auto/client/iviapplication/.prev_CMakeLists.txt b/tests/auto/client/iviapplication/.prev_CMakeLists.txt deleted file mode 100644 index a545e55f..00000000 --- a/tests/auto/client/iviapplication/.prev_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Generated from iviapplication.pro. - -##################################################################### -## tst_client_iviapplication Test: -##################################################################### - -qt_internal_add_test(tst_client_iviapplication - SOURCES - ../shared_old/mockcompositor.cpp ../shared_old/mockcompositor.h - ../shared_old/mockfullscreenshellv1.cpp ../shared_old/mockfullscreenshellv1.h - ../shared_old/mockinput.cpp ../shared_old/mockinput.h - ../shared_old/mockiviapplication.cpp ../shared_old/mockiviapplication.h - ../shared_old/mockoutput.cpp ../shared_old/mockoutput.h - ../shared_old/mockregion.cpp ../shared_old/mockregion.h - ../shared_old/mocksurface.cpp ../shared_old/mocksurface.h - ../shared_old/mockwlshell.cpp ../shared_old/mockwlshell.h - tst_iviapplication.cpp - INCLUDE_DIRECTORIES - ../shared_old - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Client - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_client_iviapplication - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/fullscreen-shell-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/ivi-application.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/wayland.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/iviapplication/iviapplication.pro b/tests/auto/client/iviapplication/iviapplication.pro deleted file mode 100644 index f2d596e6..00000000 --- a/tests/auto/client/iviapplication/iviapplication.pro +++ /dev/null @@ -1,5 +0,0 @@ -include (../shared_old/shared_old.pri) - -TARGET = tst_client_iviapplication -SOURCES += tst_iviapplication.cpp - diff --git a/tests/auto/client/nooutput/.prev_CMakeLists.txt b/tests/auto/client/nooutput/.prev_CMakeLists.txt deleted file mode 100644 index 18479bdf..00000000 --- a/tests/auto/client/nooutput/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from nooutput.pro. - -##################################################################### -## tst_nooutput Test: -##################################################################### - -qt_internal_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/xdgoutputv1.cpp ../shared/xdgoutputv1.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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/nooutput/nooutput.pro b/tests/auto/client/nooutput/nooutput.pro deleted file mode 100644 index 1d8dc562..00000000 --- a/tests/auto/client/nooutput/nooutput.pro +++ /dev/null @@ -1,5 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_nooutput -SOURCES += tst_nooutput.cpp - diff --git a/tests/auto/client/output/.prev_CMakeLists.txt b/tests/auto/client/output/.prev_CMakeLists.txt deleted file mode 100644 index 4103d7a8..00000000 --- a/tests/auto/client/output/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from output.pro. - -##################################################################### -## tst_output Test: -##################################################################### - -qt_internal_add_test(tst_output - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_output.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_output - 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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/output/output.pro b/tests/auto/client/output/output.pro deleted file mode 100644 index d1dc672f..00000000 --- a/tests/auto/client/output/output.pro +++ /dev/null @@ -1,5 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_output -SOURCES += tst_output.cpp - diff --git a/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt b/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt deleted file mode 100644 index 9c207adc..00000000 --- a/tests/auto/client/primaryselectionv1/.prev_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Generated from primaryselectionv1.pro. - -##################################################################### -## tst_primaryselectionv1 Test: -##################################################################### - -qt_internal_add_test(tst_primaryselectionv1 - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_primaryselectionv1.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_primaryselectionv1 - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/wp-primary-selection-unstable-v1.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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/primaryselectionv1/primaryselectionv1.pro b/tests/auto/client/primaryselectionv1/primaryselectionv1.pro deleted file mode 100644 index 9d00562d..00000000 --- a/tests/auto/client/primaryselectionv1/primaryselectionv1.pro +++ /dev/null @@ -1,7 +0,0 @@ -include (../shared/shared.pri) - -WAYLANDSERVERSOURCES += \ - $$PWD/../../../../src/3rdparty/protocol/wp-primary-selection-unstable-v1.xml - -TARGET = tst_primaryselectionv1 -SOURCES += tst_primaryselectionv1.cpp diff --git a/tests/auto/client/seatv4/.prev_CMakeLists.txt b/tests/auto/client/seatv4/.prev_CMakeLists.txt deleted file mode 100644 index 16eed042..00000000 --- a/tests/auto/client/seatv4/.prev_CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -# Generated from seatv4.pro. - -##################################################################### -## tst_seatv4 Test: -##################################################################### - -qt_internal_add_test(tst_seatv4 - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_seatv4.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_seatv4 - 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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_seatv4 CONDITION QT_FEATURE_cursor - PUBLIC_LIBRARIES - Qt::GuiPrivate - Wayland::Cursor -) diff --git a/tests/auto/client/seatv4/seatv4.pro b/tests/auto/client/seatv4/seatv4.pro deleted file mode 100644 index 7a86cbf0..00000000 --- a/tests/auto/client/seatv4/seatv4.pro +++ /dev/null @@ -1,9 +0,0 @@ -include (../shared/shared.pri) - -qtConfig(cursor) { - QMAKE_USE += wayland-cursor - QT += gui-private -} - -TARGET = tst_seatv4 -SOURCES += tst_seatv4.cpp diff --git a/tests/auto/client/seatv5/.prev_CMakeLists.txt b/tests/auto/client/seatv5/.prev_CMakeLists.txt deleted file mode 100644 index f30c0c76..00000000 --- a/tests/auto/client/seatv5/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from seatv5.pro. - -##################################################################### -## tst_seatv5 Test: -##################################################################### - -qt_internal_add_test(tst_seatv5 - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_seatv5.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_seatv5 - 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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/seatv5/seatv5.pro b/tests/auto/client/seatv5/seatv5.pro deleted file mode 100644 index 2081845e..00000000 --- a/tests/auto/client/seatv5/seatv5.pro +++ /dev/null @@ -1,4 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_seatv5 -SOURCES += tst_seatv5.cpp diff --git a/tests/auto/client/surface/.prev_CMakeLists.txt b/tests/auto/client/surface/.prev_CMakeLists.txt deleted file mode 100644 index ed900c8d..00000000 --- a/tests/auto/client/surface/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from surface.pro. - -##################################################################### -## tst_surface Test: -##################################################################### - -qt_internal_add_test(tst_surface - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_surface.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_surface - 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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/surface/surface.pro b/tests/auto/client/surface/surface.pro deleted file mode 100644 index 36882aa2..00000000 --- a/tests/auto/client/surface/surface.pro +++ /dev/null @@ -1,5 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_surface -SOURCES += tst_surface.cpp - diff --git a/tests/auto/client/tabletv2/.prev_CMakeLists.txt b/tests/auto/client/tabletv2/.prev_CMakeLists.txt deleted file mode 100644 index 96b32d24..00000000 --- a/tests/auto/client/tabletv2/.prev_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Generated from tabletv2.pro. - -##################################################################### -## tst_tabletv2 Test: -##################################################################### - -qt_internal_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/xdgoutputv1.cpp ../shared/xdgoutputv1.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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/tabletv2/tabletv2.pro b/tests/auto/client/tabletv2/tabletv2.pro deleted file mode 100644 index 9dc9636e..00000000 --- a/tests/auto/client/tabletv2/tabletv2.pro +++ /dev/null @@ -1,7 +0,0 @@ -include (../shared/shared.pri) - -WAYLANDSERVERSOURCES += \ - $$PWD/../../../../src/3rdparty/protocol/tablet-unstable-v2.xml - -TARGET = tst_tabletv2 -SOURCES += tst_tabletv2.cpp diff --git a/tests/auto/client/wl_connect/wl_connect.pro b/tests/auto/client/wl_connect/wl_connect.pro deleted file mode 100644 index 28723bee..00000000 --- a/tests/auto/client/wl_connect/wl_connect.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -QT += gui-private testlib - -SOURCES += tst_wlconnect.cpp -TARGET = tst_wlconnect diff --git a/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt b/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt deleted file mode 100644 index 31588782..00000000 --- a/tests/auto/client/xdgdecorationv1/.prev_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Generated from xdgdecorationv1.pro. - -##################################################################### -## tst_xdgdecorationv1 Test: -##################################################################### - -qt_internal_add_test(tst_xdgdecorationv1 - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_xdgdecorationv1.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_xdgdecorationv1 - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/3rdparty/protocol/xdg-decoration-unstable-v1.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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/xdgdecorationv1/xdgdecorationv1.pro b/tests/auto/client/xdgdecorationv1/xdgdecorationv1.pro deleted file mode 100644 index 0b553720..00000000 --- a/tests/auto/client/xdgdecorationv1/xdgdecorationv1.pro +++ /dev/null @@ -1,7 +0,0 @@ -include (../shared/shared.pri) - -WAYLANDSERVERSOURCES += \ - $$PWD/../../../../src/3rdparty/protocol/xdg-decoration-unstable-v1.xml - -TARGET = tst_xdgdecorationv1 -SOURCES += tst_xdgdecorationv1.cpp diff --git a/tests/auto/client/xdgoutput/.prev_CMakeLists.txt b/tests/auto/client/xdgoutput/.prev_CMakeLists.txt deleted file mode 100644 index 33357ffd..00000000 --- a/tests/auto/client/xdgoutput/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from xdgoutput.pro. - -##################################################################### -## tst_xdgoutput Test: -##################################################################### - -qt_internal_add_test(tst_xdgoutput - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_xdgoutput.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_xdgoutput - 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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/xdgoutput/xdgoutput.pro b/tests/auto/client/xdgoutput/xdgoutput.pro deleted file mode 100644 index f6532754..00000000 --- a/tests/auto/client/xdgoutput/xdgoutput.pro +++ /dev/null @@ -1,5 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_xdgoutput -SOURCES += tst_xdgoutput.cpp - diff --git a/tests/auto/client/xdgshell/.prev_CMakeLists.txt b/tests/auto/client/xdgshell/.prev_CMakeLists.txt deleted file mode 100644 index a3872d72..00000000 --- a/tests/auto/client/xdgshell/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from xdgshell.pro. - -##################################################################### -## tst_xdgshell Test: -##################################################################### - -qt_internal_add_test(tst_xdgshell - 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/xdgoutputv1.cpp ../shared/xdgoutputv1.h - ../shared/xdgshell.cpp ../shared/xdgshell.h - tst_xdgshell.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::WaylandClientPrivate - Wayland::Server -) - -qt6_generate_wayland_protocol_server_sources(tst_xdgshell - 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-output-unstable-v1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml -) diff --git a/tests/auto/client/xdgshell/xdgshell.pro b/tests/auto/client/xdgshell/xdgshell.pro deleted file mode 100644 index d7c3f9df..00000000 --- a/tests/auto/client/xdgshell/xdgshell.pro +++ /dev/null @@ -1,5 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_xdgshell -SOURCES += tst_xdgshell.cpp - diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro deleted file mode 100644 index 5098c2ce..00000000 --- a/tests/auto/cmake/cmake.pro +++ /dev/null @@ -1,6 +0,0 @@ -# Cause make to do nothing. -TEMPLATE = subdirs - -CMAKE_QT_MODULES_UNDER_TEST = waylandclient - -CONFIG += ctest_testcase diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro deleted file mode 100644 index 6bf2aef6..00000000 --- a/tests/auto/compositor/compositor.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE=subdirs - -SUBDIRS += compositor diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro deleted file mode 100644 index 27001659..00000000 --- a/tests/auto/compositor/compositor/compositor.pro +++ /dev/null @@ -1,40 +0,0 @@ -CONFIG += testcase link_pkgconfig -CONFIG += wayland-scanner -TARGET = tst_compositor - -QT += testlib -QT += core-private gui-private waylandcompositor waylandcompositor-private - -QMAKE_USE += wayland-client wayland-server - -qtConfig(xkbcommon): \ - QMAKE_USE += xkbcommon - -WAYLANDCLIENTSOURCES += \ - ../../../../src/3rdparty/protocol/ivi-application.xml \ - ../../../../src/3rdparty/protocol/wayland.xml \ - ../../../../src/3rdparty/protocol/xdg-shell.xml \ - ../../../../src/3rdparty/protocol/viewporter.xml \ - ../../../../src/3rdparty/protocol/idle-inhibit-unstable-v1.xml \ - ../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml - -SOURCES += \ - tst_compositor.cpp \ - testcompositor.cpp \ - testkeyboardgrabber.cpp \ - mockclient.cpp \ - mockseat.cpp \ - testseat.cpp \ - mockkeyboard.cpp \ - mockpointer.cpp \ - mockxdgoutputv1.cpp - -HEADERS += \ - testcompositor.h \ - testkeyboardgrabber.h \ - mockclient.h \ - mockseat.h \ - testseat.h \ - mockkeyboard.h \ - mockpointer.h \ - mockxdgoutputv1.h diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index 85e4f3a5..00000000 --- a/tests/tests.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += auto |