diff --git a/src/plugins/platforms/wayland/.prev_CMakeLists.txt b/src/plugins/platforms/wayland/.prev_CMakeLists.txt deleted file mode 100644 index ede73a07ca0..00000000000 --- a/src/plugins/platforms/wayland/.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:: -# 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/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro deleted file mode 100644 index 5a071d9ed93..00000000000 --- a/src/plugins/platforms/wayland/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/plugins/platforms/wayland/plugins/decorations/bradient/bradient.pro b/src/plugins/platforms/wayland/plugins/decorations/bradient/bradient.pro deleted file mode 100644 index e31576783b6..00000000000 --- a/src/plugins/platforms/wayland/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/platforms/wayland/plugins/decorations/decorations.pro b/src/plugins/platforms/wayland/plugins/decorations/decorations.pro deleted file mode 100644 index 6d51a450fb2..00000000000 --- a/src/plugins/platforms/wayland/plugins/decorations/decorations.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - bradient diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/brcm-egl.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/brcm-egl.pro deleted file mode 100644 index c2e9ad4ffb9..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/client.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro deleted file mode 100644 index 7b7e8a49af8..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro deleted file mode 100644 index 3c91b2ecf0a..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro deleted file mode 100644 index 390278b1c7d..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.pro deleted file mode 100644 index 3193b8f6877..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/shm-emulation-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/shm-emulation-server.pro deleted file mode 100644 index 9e9319d2535..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.pro deleted file mode 100644 index 13cb2ab90e6..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/wayland-egl/.prev_CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/.prev_CMakeLists.txt deleted file mode 100644 index b1732b014b4..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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:: -# OTHER_FILES = "wayland-egl.json" diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/wayland-egl.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/wayland-egl.pro deleted file mode 100644 index 409cd37d7c7..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/.prev_CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/.prev_CMakeLists.txt deleted file mode 100644 index f575d44e935..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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:: -# OTHER_FILES = "xcomposite-egl.json" -# QMAKE_CXXFLAGS_WARN_ON = "--Wcast-qual" diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/xcomposite-egl.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/xcomposite-egl.pro deleted file mode 100644 index 83bd4fe8d84..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/xcomposite-glx.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/xcomposite-glx.pro deleted file mode 100644 index 804ca386197..00000000000 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/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/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/fullscreen-shell-v1.pro b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/fullscreen-shell-v1.pro deleted file mode 100644 index a522f87a8d3..00000000000 --- a/src/plugins/platforms/wayland/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/platforms/wayland/plugins/shellintegration/shellintegration.pro b/src/plugins/platforms/wayland/plugins/shellintegration/shellintegration.pro deleted file mode 100644 index 8cfad2d4f81..00000000000 --- a/src/plugins/platforms/wayland/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/platforms/wayland/plugins/shellintegration/wl-shell/wl-shell.pro b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/wl-shell.pro deleted file mode 100644 index bb2c1829afe..00000000000 --- a/src/plugins/platforms/wayland/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/platforms/wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro deleted file mode 100644 index 261715845c8..00000000000 --- a/src/plugins/platforms/wayland/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/tools/qtwaylandscanner/.prev_CMakeLists.txt b/src/tools/qtwaylandscanner/.prev_CMakeLists.txt deleted file mode 100644 index 156ef030ead..00000000000 --- a/src/tools/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:: -# _OPTION = "host_build" diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.pro b/src/tools/qtwaylandscanner/qtwaylandscanner.pro deleted file mode 100644 index cad7bbfb6a1..00000000000 --- a/src/tools/qtwaylandscanner/qtwaylandscanner.pro +++ /dev/null @@ -1,7 +0,0 @@ -option(host_build) - -SOURCES += qtwaylandscanner.cpp -QT = core - -load(qt_tool) - diff --git a/tests/auto/wayland/client.pro b/tests/auto/wayland/client.pro deleted file mode 100644 index 7f5ffc0f7bd..00000000000 --- a/tests/auto/wayland/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/wayland/client/.prev_CMakeLists.txt b/tests/auto/wayland/client/.prev_CMakeLists.txt deleted file mode 100644 index 0aeb3f27f0c..00000000000 --- a/tests/auto/wayland/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:: -# check.commands = "$(TESTRUNNER)" "$${PWD}/run-with-all-shells.sh" "$(TESTARGS)" diff --git a/tests/auto/wayland/client/client.pro b/tests/auto/wayland/client/client.pro deleted file mode 100644 index 7c3a934d067..00000000000 --- a/tests/auto/wayland/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/wayland/datadevicev1/.prev_CMakeLists.txt b/tests/auto/wayland/datadevicev1/.prev_CMakeLists.txt deleted file mode 100644 index 6a1060b3816..00000000000 --- a/tests/auto/wayland/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/wayland/datadevicev1/datadevicev1.pro b/tests/auto/wayland/datadevicev1/datadevicev1.pro deleted file mode 100644 index b3c687c4dff..00000000000 --- a/tests/auto/wayland/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/wayland/fullscreenshellv1/.prev_CMakeLists.txt b/tests/auto/wayland/fullscreenshellv1/.prev_CMakeLists.txt deleted file mode 100644 index ca850796223..00000000000 --- a/tests/auto/wayland/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/wayland/fullscreenshellv1/fullscreenshellv1.pro b/tests/auto/wayland/fullscreenshellv1/fullscreenshellv1.pro deleted file mode 100644 index c4006cdd870..00000000000 --- a/tests/auto/wayland/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/wayland/inputcontext/.prev_CMakeLists.txt b/tests/auto/wayland/inputcontext/.prev_CMakeLists.txt deleted file mode 100644 index 2d2783926b2..00000000000 --- a/tests/auto/wayland/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/wayland/inputcontext/inputcontext.pro b/tests/auto/wayland/inputcontext/inputcontext.pro deleted file mode 100644 index 1971d455ead..00000000000 --- a/tests/auto/wayland/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/wayland/iviapplication/.prev_CMakeLists.txt b/tests/auto/wayland/iviapplication/.prev_CMakeLists.txt deleted file mode 100644 index a545e55f72f..00000000000 --- a/tests/auto/wayland/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/wayland/iviapplication/iviapplication.pro b/tests/auto/wayland/iviapplication/iviapplication.pro deleted file mode 100644 index f2d596e6c93..00000000000 --- a/tests/auto/wayland/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/wayland/nooutput/.prev_CMakeLists.txt b/tests/auto/wayland/nooutput/.prev_CMakeLists.txt deleted file mode 100644 index 18479bdfc49..00000000000 --- a/tests/auto/wayland/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/wayland/nooutput/nooutput.pro b/tests/auto/wayland/nooutput/nooutput.pro deleted file mode 100644 index 1d8dc562663..00000000000 --- a/tests/auto/wayland/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/wayland/output/.prev_CMakeLists.txt b/tests/auto/wayland/output/.prev_CMakeLists.txt deleted file mode 100644 index 4103d7a8bb4..00000000000 --- a/tests/auto/wayland/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/wayland/output/output.pro b/tests/auto/wayland/output/output.pro deleted file mode 100644 index d1dc672f060..00000000000 --- a/tests/auto/wayland/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/wayland/primaryselectionv1/.prev_CMakeLists.txt b/tests/auto/wayland/primaryselectionv1/.prev_CMakeLists.txt deleted file mode 100644 index 9c207adc1cc..00000000000 --- a/tests/auto/wayland/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/wayland/primaryselectionv1/primaryselectionv1.pro b/tests/auto/wayland/primaryselectionv1/primaryselectionv1.pro deleted file mode 100644 index 9d00562df81..00000000000 --- a/tests/auto/wayland/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/wayland/seatv4/.prev_CMakeLists.txt b/tests/auto/wayland/seatv4/.prev_CMakeLists.txt deleted file mode 100644 index 16eed042e42..00000000000 --- a/tests/auto/wayland/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/wayland/seatv4/seatv4.pro b/tests/auto/wayland/seatv4/seatv4.pro deleted file mode 100644 index 7a86cbf0390..00000000000 --- a/tests/auto/wayland/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/wayland/seatv5/.prev_CMakeLists.txt b/tests/auto/wayland/seatv5/.prev_CMakeLists.txt deleted file mode 100644 index f30c0c76619..00000000000 --- a/tests/auto/wayland/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/wayland/seatv5/seatv5.pro b/tests/auto/wayland/seatv5/seatv5.pro deleted file mode 100644 index 2081845efa8..00000000000 --- a/tests/auto/wayland/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/wayland/surface/.prev_CMakeLists.txt b/tests/auto/wayland/surface/.prev_CMakeLists.txt deleted file mode 100644 index ed900c8d1a4..00000000000 --- a/tests/auto/wayland/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/wayland/surface/surface.pro b/tests/auto/wayland/surface/surface.pro deleted file mode 100644 index 36882aa2df2..00000000000 --- a/tests/auto/wayland/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/wayland/tabletv2/.prev_CMakeLists.txt b/tests/auto/wayland/tabletv2/.prev_CMakeLists.txt deleted file mode 100644 index 96b32d24b25..00000000000 --- a/tests/auto/wayland/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/wayland/tabletv2/tabletv2.pro b/tests/auto/wayland/tabletv2/tabletv2.pro deleted file mode 100644 index 9dc9636e910..00000000000 --- a/tests/auto/wayland/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/wayland/wl_connect/wl_connect.pro b/tests/auto/wayland/wl_connect/wl_connect.pro deleted file mode 100644 index 28723beee9b..00000000000 --- a/tests/auto/wayland/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/wayland/xdgdecorationv1/.prev_CMakeLists.txt b/tests/auto/wayland/xdgdecorationv1/.prev_CMakeLists.txt deleted file mode 100644 index 31588782ec1..00000000000 --- a/tests/auto/wayland/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/wayland/xdgdecorationv1/xdgdecorationv1.pro b/tests/auto/wayland/xdgdecorationv1/xdgdecorationv1.pro deleted file mode 100644 index 0b553720582..00000000000 --- a/tests/auto/wayland/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/wayland/xdgoutput/.prev_CMakeLists.txt b/tests/auto/wayland/xdgoutput/.prev_CMakeLists.txt deleted file mode 100644 index 33357ffdce2..00000000000 --- a/tests/auto/wayland/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/wayland/xdgoutput/xdgoutput.pro b/tests/auto/wayland/xdgoutput/xdgoutput.pro deleted file mode 100644 index f65327546c2..00000000000 --- a/tests/auto/wayland/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/wayland/xdgshell/.prev_CMakeLists.txt b/tests/auto/wayland/xdgshell/.prev_CMakeLists.txt deleted file mode 100644 index a3872d72607..00000000000 --- a/tests/auto/wayland/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/wayland/xdgshell/xdgshell.pro b/tests/auto/wayland/xdgshell/xdgshell.pro deleted file mode 100644 index d7c3f9df658..00000000000 --- a/tests/auto/wayland/xdgshell/xdgshell.pro +++ /dev/null @@ -1,5 +0,0 @@ -include (../shared/shared.pri) - -TARGET = tst_xdgshell -SOURCES += tst_xdgshell.cpp -