From 3c04dd8b26e276ae7649021135496d1ed3b111f1 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 5 Aug 2021 13:04:07 +0200 Subject: CMake: Use renamed qt6_add_plugin PLUGIN_TYPE option Task-number: QTBUG-95170 Pick-to: 6.2 Change-Id: I60fd4ef84fb4887294bde766790b279d12f1288a Reviewed-by: Kai Koehne --- src/plugins/decorations/bradient/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt | 2 +- .../hardwareintegration/client/libhybris-egl-server/CMakeLists.txt | 2 +- .../hardwareintegration/client/shm-emulation-server/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt | 2 +- .../hardwareintegration/compositor/drm-egl-server/CMakeLists.txt | 2 +- .../hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt | 2 +- .../hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt | 2 +- .../compositor/linux-dmabuf-unstable-v1/CMakeLists.txt | 2 +- .../hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt | 2 +- src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt | 2 +- .../compositor/wayland-eglstream-controller/CMakeLists.txt | 2 +- .../hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt | 2 +- .../hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt | 2 +- src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt | 2 +- src/plugins/platforms/qwayland-egl/CMakeLists.txt | 2 +- src/plugins/platforms/qwayland-generic/CMakeLists.txt | 2 +- src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt | 2 +- src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt | 2 +- src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt | 2 +- src/plugins/shellintegration/ivi-shell/CMakeLists.txt | 2 +- src/plugins/shellintegration/wl-shell/CMakeLists.txt | 2 +- src/plugins/shellintegration/xdg-shell/CMakeLists.txt | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/plugins/decorations/bradient/CMakeLists.txt b/src/plugins/decorations/bradient/CMakeLists.txt index a914ea3c9..6f36d506c 100644 --- a/src/plugins/decorations/bradient/CMakeLists.txt +++ b/src/plugins/decorations/bradient/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandBradientDecorationPlugin OUTPUT_NAME bradient - TYPE wayland-decoration-client + PLUGIN_TYPE wayland-decoration-client SOURCES main.cpp LIBRARIES diff --git a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt index 5cf358b00..b1304c7f7 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandBrcmEglClientBufferPlugin OUTPUT_NAME brcm-egl - TYPE wayland-graphics-integration-client + PLUGIN_TYPE wayland-graphics-integration-client SOURCES ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ../../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt index 8476ef7b7..9104dbc75 100644 --- a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(DmaBufServerBufferPlugin OUTPUT_NAME dmabuf-server - TYPE wayland-graphics-integration-client + PLUGIN_TYPE wayland-graphics-integration-client SOURCES ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt index 5e0b08d0a..1c91dd74b 100644 --- a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(DrmEglServerBufferPlugin OUTPUT_NAME drm-egl-server - TYPE wayland-graphics-integration-client + PLUGIN_TYPE wayland-graphics-integration-client SOURCES ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt index ed3c4c98f..32c6f6d7e 100644 --- a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(LibHybrisEglServerBufferPlugin OUTPUT_NAME libhybris-egl-server - TYPE wayland-graphics-integration-client + PLUGIN_TYPE wayland-graphics-integration-client SOURCES ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt index 326dd8254..679039e13 100644 --- a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(ShmServerBufferPlugin OUTPUT_NAME shm-emulation-server - TYPE wayland-graphics-integration-client + PLUGIN_TYPE wayland-graphics-integration-client SOURCES ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt index bda421eda..c6beea9b2 100644 --- a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(VulkanServerBufferPlugin OUTPUT_NAME vulkan-server - TYPE wayland-graphics-integration-client + PLUGIN_TYPE wayland-graphics-integration-client SOURCES ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt index a3062eec0..39f05ca12 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QWaylandEglClientBufferPlugin OUTPUT_NAME qt-plugin-wayland-egl - TYPE wayland-graphics-integration-client + PLUGIN_TYPE wayland-graphics-integration-client SOURCES main.cpp LIBRARIES diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt index fa61db72f..fe546d7d1 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin OUTPUT_NAME xcomposite-egl - TYPE wayland-graphics-integration-client + PLUGIN_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 diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt index 819f10eb7..b4d7340b8 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferPlugin OUTPUT_NAME xcomposite-glx - TYPE wayland-graphics-integration-client + PLUGIN_TYPE wayland-graphics-integration-client SOURCES ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp ../../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt index f3b23112a..93a64ea86 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandBrcmClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-brcm-egl - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.h ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.h diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt index b3ffcb81b..2acbf42f7 100644 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(DmaBufServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-dmabuf-server-buffer - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt index 61c9c30c7..504874735 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(DrmEglServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-drm-egl-server-buffer - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt index aa305ef79..2dedea44c 100644 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(Vsp2HardwareLayerIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-vsp2 - TYPE wayland-hardware-layer-integration + PLUGIN_TYPE wayland-hardware-layer-integration SOURCES ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt index 4d97d0345..31c55be9a 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(LibHybrisEglServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-libybris-egl-server.json - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt index 12f411284..47596a659 100644 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-linux-dmabuf-unstable-v1 - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt index 2fd08b514..b271256da 100644 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(ShmServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-shm-emulation-server - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt index 5ebc0dac6..29ad7f7b5 100644 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(VulkanServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-vulkan-server - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.h diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt index db3ee6337..95d4bda24 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-wayland-egl - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES main.cpp LIBRARIES diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt index d36e69e51..c7b0cd1ec 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QWaylandEglStreamClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller - TYPE wayland-graphics-integration-server + PLUGIN_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 diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt index de75ba7c1..e68a05847 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-xcomposite-egl - TYPE wayland-graphics-integration-server + PLUGIN_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 diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt index cc8e02811..a0befcc28 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-xcomposite-glx - TYPE wayland-graphics-integration-server + PLUGIN_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 diff --git a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt index e87767660..ed3b00e12 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandBrcmEglPlatformIntegrationPlugin OUTPUT_NAME qwayland-brcm-egl - TYPE platforms + PLUGIN_TYPE platforms SOURCES ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h diff --git a/src/plugins/platforms/qwayland-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-egl/CMakeLists.txt index 1f5ee4124..4d184f308 100644 --- a/src/plugins/platforms/qwayland-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-egl/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QWaylandEglPlatformIntegrationPlugin OUTPUT_NAME qwayland-egl - TYPE platforms + PLUGIN_TYPE platforms SOURCES main.cpp LIBRARIES diff --git a/src/plugins/platforms/qwayland-generic/CMakeLists.txt b/src/plugins/platforms/qwayland-generic/CMakeLists.txt index f246983fd..85bb250cc 100644 --- a/src/plugins/platforms/qwayland-generic/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-generic/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandIntegrationPlugin OUTPUT_NAME qwayland-generic - TYPE platforms + PLUGIN_TYPE platforms DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wayland # special case SOURCES main.cpp diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt index 0b3afc682..3029061f5 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin OUTPUT_NAME qwayland-xcomposite-egl - TYPE platforms + PLUGIN_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 diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt index 9e31e73ef..38f56d336 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandXCompositeGlxPlatformIntegrationPlugin OUTPUT_NAME qwayland-xcomposite-glx - TYPE platforms + PLUGIN_TYPE platforms SOURCES ../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp ../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h ../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp ../../../hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h diff --git a/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt b/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt index b4b73cdc2..ee02e1ebf 100644 --- a/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt +++ b/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandFullScreenShellV1IntegrationPlugin OUTPUT_NAME fullscreen-shell-v1 - TYPE wayland-shell-integration + PLUGIN_TYPE wayland-shell-integration SOURCES main.cpp qwaylandfullscreenshellv1integration.cpp qwaylandfullscreenshellv1integration.h diff --git a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt index 7843a22e6..b80280e50 100644 --- a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt +++ b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandIviShellIntegrationPlugin OUTPUT_NAME ivi-shell - TYPE wayland-shell-integration + PLUGIN_TYPE wayland-shell-integration SOURCES main.cpp qwaylandivishellintegration.cpp qwaylandivishellintegration.h diff --git a/src/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/shellintegration/wl-shell/CMakeLists.txt index 38033e031..6b9ff55fe 100644 --- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/plugins/shellintegration/wl-shell/CMakeLists.txt @@ -39,7 +39,7 @@ qt_internal_extend_target(WlShellIntegrationPrivate CONDITION QT_FEATURE_xkbcomm qt_internal_add_plugin(QWaylandWlShellIntegrationPlugin OUTPUT_NAME wl-shell-plugin - TYPE wayland-shell-integration + PLUGIN_TYPE wayland-shell-integration SOURCES main.cpp LIBRARIES diff --git a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt index 81db88a9c..62e3952bd 100644 --- a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt +++ b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QWaylandXdgShellIntegrationPlugin OUTPUT_NAME xdg-shell - TYPE wayland-shell-integration + PLUGIN_TYPE wayland-shell-integration SOURCES main.cpp qwaylandxdgdecorationv1.cpp qwaylandxdgdecorationv1_p.h -- cgit v1.2.3