From abcea0d2496f55aeb98251c013cfe58d4f1afaab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 28 Feb 2025 10:54:51 +0100 Subject: [PATCH] Remove old qmake .pri files The .pro files for building the client and compositor modules have been removed already, so we don't need the .pri helpers. Change-Id: Ieb8ea7cc292e6b2c98e4f24932810ef426a54141 Reviewed-by: Liang Qi --- .../platforms/wayland/global/global.pri | 9 ------ .../hardwareintegration.pri | 24 --------------- .../inputdeviceintegration.pri | 11 ------- .../shellintegration/shellintegration.pri | 11 ------- tests/auto/wayland/shared/shared.pri | 29 ------------------- 5 files changed, 84 deletions(-) delete mode 100644 src/plugins/platforms/wayland/global/global.pri delete mode 100644 src/plugins/platforms/wayland/hardwareintegration/hardwareintegration.pri delete mode 100644 src/plugins/platforms/wayland/inputdeviceintegration/inputdeviceintegration.pri delete mode 100644 src/plugins/platforms/wayland/shellintegration/shellintegration.pri delete mode 100644 tests/auto/wayland/shared/shared.pri diff --git a/src/plugins/platforms/wayland/global/global.pri b/src/plugins/platforms/wayland/global/global.pri deleted file mode 100644 index 53c76cbc9db..00000000000 --- a/src/plugins/platforms/wayland/global/global.pri +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/qwaylandclientextension.h \ - $$PWD/qwaylandclientextension_p.h - -SOURCES += \ - $$PWD/qwaylandclientextension.cpp - diff --git a/src/plugins/platforms/wayland/hardwareintegration/hardwareintegration.pri b/src/plugins/platforms/wayland/hardwareintegration/hardwareintegration.pri deleted file mode 100644 index bb4fe76d6b0..00000000000 --- a/src/plugins/platforms/wayland/hardwareintegration/hardwareintegration.pri +++ /dev/null @@ -1,24 +0,0 @@ -WAYLANDCLIENTSOURCES += \ - $$PWD/../../extensions/server-buffer-extension.xml \ - $$PWD/../../extensions/hardware-integration.xml - -INCLUDEPATH += $$PWD - -SOURCES += \ - $$PWD/qwaylandclientbufferintegration.cpp \ - $$PWD/qwaylandclientbufferintegrationplugin.cpp \ - $$PWD/qwaylandclientbufferintegrationfactory.cpp \ - $$PWD/qwaylandserverbufferintegration.cpp \ - $$PWD/qwaylandserverbufferintegrationplugin.cpp \ - $$PWD/qwaylandserverbufferintegrationfactory.cpp \ - $$PWD/qwaylandhardwareintegration.cpp - -HEADERS += \ - $$PWD/qwaylandclientbufferintegration_p.h \ - $$PWD/qwaylandclientbufferintegrationplugin_p.h \ - $$PWD/qwaylandclientbufferintegrationfactory_p.h \ - $$PWD/qwaylandserverbufferintegration_p.h \ - $$PWD/qwaylandserverbufferintegrationplugin_p.h \ - $$PWD/qwaylandserverbufferintegrationfactory_p.h \ - $$PWD/qwaylandhardwareintegration_p.h - diff --git a/src/plugins/platforms/wayland/inputdeviceintegration/inputdeviceintegration.pri b/src/plugins/platforms/wayland/inputdeviceintegration/inputdeviceintegration.pri deleted file mode 100644 index f16dfc3c953..00000000000 --- a/src/plugins/platforms/wayland/inputdeviceintegration/inputdeviceintegration.pri +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDEPATH += $$PWD - -SOURCES += \ - $$PWD/qwaylandinputdeviceintegrationplugin.cpp \ - $$PWD/qwaylandinputdeviceintegrationfactory.cpp - -HEADERS += \ - $$PWD/qwaylandinputdeviceintegration_p.h \ - $$PWD/qwaylandinputdeviceintegrationplugin_p.h \ - $$PWD/qwaylandinputdeviceintegrationfactory_p.h - diff --git a/src/plugins/platforms/wayland/shellintegration/shellintegration.pri b/src/plugins/platforms/wayland/shellintegration/shellintegration.pri deleted file mode 100644 index de889a47af2..00000000000 --- a/src/plugins/platforms/wayland/shellintegration/shellintegration.pri +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDEPATH += $$PWD - -SOURCES += \ - $$PWD/qwaylandshellintegrationplugin.cpp \ - $$PWD/qwaylandshellintegrationfactory.cpp - -HEADERS += \ - $$PWD/qwaylandshellintegration_p.h \ - $$PWD/qwaylandshellintegrationplugin_p.h \ - $$PWD/qwaylandshellintegrationfactory_p.h - diff --git a/tests/auto/wayland/shared/shared.pri b/tests/auto/wayland/shared/shared.pri deleted file mode 100644 index e81ad9d4a64..00000000000 --- a/tests/auto/wayland/shared/shared.pri +++ /dev/null @@ -1,29 +0,0 @@ -QT += testlib waylandclient-private opengl -CONFIG += testcase wayland-scanner -QMAKE_USE += wayland-server - -WAYLANDSERVERSOURCES += \ - $$PWD/../../../../src/3rdparty/protocol/wayland/wayland.xml \ - $$PWD/../../../../src/3rdparty/protocol/xdg-output/xdg-output-unstable-v1.xml \ - $$PWD/../../../../src/3rdparty/protocol/xdg-shell/xdg-shell.xml \ - $$PWD/../../../../src/3rdparty/protocol/text-input/text-input-unstable-v2.xml - -INCLUDEPATH += ../shared - -HEADERS += \ - $$PWD/corecompositor.h \ - $$PWD/coreprotocol.h \ - $$PWD/datadevice.h \ - $$PWD/mockcompositor.h \ - $$PWD/xdgoutputv1.h \ - $$PWD/xdgshell.h \ - $$PWD/textinput.h - -SOURCES += \ - $$PWD/corecompositor.cpp \ - $$PWD/coreprotocol.cpp \ - $$PWD/datadevice.cpp \ - $$PWD/mockcompositor.cpp \ - $$PWD/xdgoutputv1.cpp \ - $$PWD/xdgshell.cpp \ - $$PWD/textinput.cpp