diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-26 14:26:23 +0200 |
---|---|---|
committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-01 08:09:04 +0200 |
commit | 5189d6316fc84c098e26e9dfa877d73d7f090287 (patch) | |
tree | 38d635d44e312abdefde475322c213967db78e11 | |
parent | 79fb1089474514dbe1b25004df126d3194c952a8 (diff) |
Remove $PWD from compositor plugin .pro files
It's not needed and the CMake conversion scripts doesn't handle it properly.
Furthermore, we already use a mix of the $PWD style vs. the non $PWD-style, so
this makes things more consistent as well.
Task-number: QTBUG-78177
Change-Id: I23c17494506469881bc7539a941c82c65843a413
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
6 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro b/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro index 5771d570..d96e5813 100644 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro +++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro @@ -7,7 +7,7 @@ SOURCES += \ TARGET = qt-wayland-compositor-dmabuf-server-buffer -include($PWD/../../../../../hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri) +include(../../../../hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri) PLUGIN_TYPE = wayland-graphics-integration-server PLUGIN_CLASS_NAME = DmaBufServerBufferIntegrationPlugin 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 index aeaa54c4..2ba17c38 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro @@ -7,7 +7,7 @@ SOURCES += \ TARGET = qt-wayland-compositor-drm-egl-server-buffer -include($PWD/../../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri) +include(../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri) PLUGIN_TYPE = wayland-graphics-integration-server PLUGIN_CLASS_NAME = DrmEglServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro index 1c21f04e..c18884a9 100644 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro +++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro @@ -9,7 +9,7 @@ SOURCES += \ TARGET = qt-wayland-compositor-vsp2 -include($PWD/../../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pri) +include(../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pri) PLUGIN_TYPE = wayland-hardware-layer-integration PLUGIN_CLASS_NAME = Vsp2HardwareLayerIntegrationPlugin 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 index 84dc6e01..c9c3a0da 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro @@ -7,7 +7,7 @@ SOURCES += \ TARGET = qt-wayland-compositor-libybris-egl-server.json -include($PWD/../../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri) +include(../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri) PLUGIN_TYPE = wayland-graphics-integration-server PLUGIN_CLASS_NAME = LibHybrisEglServerBufferIntegrationPlugin 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 index 67026e47..865af1a7 100644 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro +++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro @@ -7,7 +7,7 @@ SOURCES += \ TARGET = qt-wayland-compositor-shm-emulation-server -include($PWD/../../../../../hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pri) +include(../../../../hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pri) PLUGIN_TYPE = wayland-graphics-integration-server PLUGIN_CLASS_NAME = ShmServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro b/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro index 28d3a585..dc82c3f2 100644 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro +++ b/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro @@ -7,7 +7,7 @@ SOURCES += \ TARGET = qt-wayland-compositor-vulkan-server -include($PWD/../../../../../hardwareintegration/compositor/vulkan-server/vulkan-server.pri) +include(../../../../hardwareintegration/compositor/vulkan-server/vulkan-server.pri) PLUGIN_TYPE = wayland-graphics-integration-server PLUGIN_CLASS_NAME = VulkanServerBufferIntegrationPlugin |