summaryrefslogtreecommitdiffstats
path: root/src/plugins/hardwareintegration
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-09-26 14:19:56 +0200
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-09-30 19:17:30 +0200
commit91ed3e7c5800a6ef4bea9d0c4d80196f94caec95 (patch)
tree171e74aa4a982b2793b10295870740ccfd3e777c /src/plugins/hardwareintegration
parent40d492e6a4f36005e6f3a274b91ae38bce42a924 (diff)
Rename compositor plugin targets
When we switch to CMake, plugin names need to be unique, otherwise we will get errors. Task-number: QTBUG-78177 Change-Id: I8a82da107260caaf23015ad275ab31ce34319771 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/plugins/hardwareintegration')
-rw-r--r--src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro2
-rw-r--r--src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro2
12 files changed, 23 insertions, 1 deletions
diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
index 53f7af8aa..c89ecec00 100644
--- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
+++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
@@ -5,6 +5,8 @@ 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
diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro b/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro
index 1601a384c..5771d5705 100644
--- a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro
+++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro
@@ -5,6 +5,8 @@ OTHER_FILES += dmabuf-server.json
SOURCES += \
main.cpp
+TARGET = qt-wayland-compositor-dmabuf-server-buffer
+
include($PWD/../../../../../hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
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 040031122..aeaa54c49 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
@@ -5,6 +5,8 @@ OTHER_FILES += drm-egl-server.json
SOURCES += \
main.cpp
+TARGET = qt-wayland-compositor-drm-egl-server-buffer
+
include($PWD/../../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro
index ff16b20bf..1c21f04e4 100644
--- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro
+++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro
@@ -7,6 +7,8 @@ OTHER_FILES += vsp2.json
SOURCES += \
main.cpp
+TARGET = qt-wayland-compositor-vsp2
+
include($PWD/../../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pri)
PLUGIN_TYPE = wayland-hardware-layer-integration
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 9e28c7e8c..84dc6e017 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
@@ -5,6 +5,8 @@ OTHER_FILES += libhybris-egl-server.json
SOURCES += \
main.cpp
+TARGET = qt-wayland-compositor-libybris-egl-server.json
+
include($PWD/../../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
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
index bc4311423..1f76f9f00 100644
--- 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
@@ -5,6 +5,8 @@ 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
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 56a1bac21..67026e475 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
@@ -5,6 +5,8 @@ OTHER_FILES += shm-emulation-server.json
SOURCES += \
main.cpp
+TARGET = qt-wayland-compositor-shm-emulation-server
+
include($PWD/../../../../../hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro b/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro
index 053654218..28d3a5852 100644
--- a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro
+++ b/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro
@@ -5,6 +5,8 @@ OTHER_FILES += vulkan-server.json
SOURCES += \
main.cpp
+TARGET = qt-wayland-compositor-vulkan-server
+
include($PWD/../../../../../hardwareintegration/compositor/vulkan-server/vulkan-server.pri)
PLUGIN_TYPE = wayland-graphics-integration-server
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro
index 6aecefffd..d452220c5 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro
@@ -5,7 +5,7 @@ OTHER_FILES += wayland-egl.json
SOURCES += \
main.cpp
-TARGET = qt-plugin-wayland-egl
+TARGET = qt-wayland-compositor-wayland-egl
include(../../../../hardwareintegration/compositor/wayland-egl/wayland-egl.pri)
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
index f1ca7183a..6d259a687 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro
+++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro
@@ -5,6 +5,8 @@ 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
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro
index 7c391bd1c..298ed2fc6 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro
@@ -5,6 +5,8 @@ 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
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro
index 0f49471da..41e5c2ec5 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro
@@ -5,6 +5,8 @@ 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