diff options
Diffstat (limited to 'src/plugins')
44 files changed, 63 insertions, 51 deletions
diff --git a/src/plugins/decorations/bradient/CMakeLists.txt b/src/plugins/decorations/bradient/CMakeLists.txt index 9bd875a40..0384eefcd 100644 --- a/src/plugins/decorations/bradient/CMakeLists.txt +++ b/src/plugins/decorations/bradient/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandBradientDecorationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandBradientDecorationPlugin +qt_internal_add_plugin(QWaylandBradientDecorationPlugin OUTPUT_NAME bradient TYPE wayland-decoration-client SOURCES diff --git a/src/plugins/decorations/bradient/main.cpp b/src/plugins/decorations/bradient/main.cpp index 666dd39d1..daae9fcb3 100644 --- a/src/plugins/decorations/bradient/main.cpp +++ b/src/plugins/decorations/bradient/main.cpp @@ -40,6 +40,7 @@ #include <QtGui/QCursor> #include <QtGui/QPainter> +#include <QtGui/QPainterPath> #include <QtGui/QPalette> #include <QtGui/QLinearGradient> #include <QtGui/QPainterPath> diff --git a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt index 038a8843c..f264dfbe9 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandBrcmEglClientBufferPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandBrcmEglClientBufferPlugin +qt_internal_add_plugin(QWaylandBrcmEglClientBufferPlugin OUTPUT_NAME brcm-egl TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt index f31e868ac..bda31db01 100644 --- a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## DmaBufServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(DmaBufServerBufferPlugin +qt_internal_add_plugin(DmaBufServerBufferPlugin OUTPUT_NAME dmabuf-server TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt index ce3f94254..b2eabcf44 100644 --- a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## DrmEglServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(DrmEglServerBufferPlugin +qt_internal_add_plugin(DrmEglServerBufferPlugin OUTPUT_NAME drm-egl-server TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt index 24cc9219e..ed3c4c98f 100644 --- a/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## LibHybrisEglServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(LibHybrisEglServerBufferPlugin +qt_internal_add_plugin(LibHybrisEglServerBufferPlugin OUTPUT_NAME libhybris-egl-server TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt index aa6e44331..6b68ab8eb 100644 --- a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## ShmServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(ShmServerBufferPlugin +qt_internal_add_plugin(ShmServerBufferPlugin OUTPUT_NAME shm-emulation-server TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt index 64ea378fa..3cfde4680 100644 --- a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## VulkanServerBufferPlugin Plugin: ##################################################################### -qt_add_plugin(VulkanServerBufferPlugin +qt_internal_add_plugin(VulkanServerBufferPlugin OUTPUT_NAME vulkan-server TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt index 2eaf092cc..b7e274170 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandEglClientBufferPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandEglClientBufferPlugin +qt_internal_add_plugin(QWaylandEglClientBufferPlugin OUTPUT_NAME qt-plugin-wayland-egl TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt index 972cb1ace..6ed42e74f 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXCompositeEglClientBufferPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXCompositeEglClientBufferPlugin +qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin OUTPUT_NAME xcomposite-egl TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt index d074fe4ee..54c18d0ed 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXCompositeGlxClientBufferPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXCompositeGlxClientBufferPlugin +qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferPlugin OUTPUT_NAME xcomposite-glx TYPE wayland-graphics-integration-client SOURCES diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt index fb3dc1adf..f3b23112a 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandBrcmClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandBrcmClientBufferIntegrationPlugin +qt_internal_add_plugin(QWaylandBrcmClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-brcm-egl TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt index 80cfd59b0..e48671727 100644 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## DmaBufServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(DmaBufServerBufferIntegrationPlugin +qt_internal_add_plugin(DmaBufServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-dmabuf-server-buffer TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt index 95c726fe2..af4eb7458 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## DrmEglServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(DrmEglServerBufferIntegrationPlugin +qt_internal_add_plugin(DrmEglServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-drm-egl-server-buffer TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt index f1040f7d4..aa305ef79 100644 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt @@ -4,7 +4,7 @@ ## Vsp2HardwareLayerIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(Vsp2HardwareLayerIntegrationPlugin +qt_internal_add_plugin(Vsp2HardwareLayerIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-vsp2 TYPE wayland-hardware-layer-integration SOURCES diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt index f0e6bec6c..4d97d0345 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## LibHybrisEglServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(LibHybrisEglServerBufferIntegrationPlugin +qt_internal_add_plugin(LibHybrisEglServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-libybris-egl-server.json TYPE wayland-graphics-integration-server SOURCES 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 35ffd7dcc..5ef55ea95 100644 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandDmabufClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin +qt_internal_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-linux-dmabuf-unstable-v1 TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt index 707a53809..0887c5176 100644 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## ShmServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(ShmServerBufferIntegrationPlugin +qt_internal_add_plugin(ShmServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-shm-emulation-server TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt index 472728a64..8a6c03add 100644 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt @@ -4,7 +4,7 @@ ## VulkanServerBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(VulkanServerBufferIntegrationPlugin +qt_internal_add_plugin(VulkanServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-vulkan-server TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt index ea307288d..f4731abfa 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandEglClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandEglClientBufferIntegrationPlugin +qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-wayland-egl TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt index 10932f15a..94ecfc41d 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandEglStreamBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandEglStreamBufferIntegrationPlugin +qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt index c8beed397..2492b259b 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin +qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-xcomposite-egl TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt index 0c448debb..c32b25ba7 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin +qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-xcomposite-glx TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt index 0a2ef9831..bf96be977 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin +qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-xcomposite-glx TYPE wayland-graphics-integration-server SOURCES diff --git a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt index 554f24ba7..4c6fa7a29 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandBrcmEglPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandBrcmEglPlatformIntegrationPlugin +qt_internal_add_plugin(QWaylandBrcmEglPlatformIntegrationPlugin OUTPUT_NAME qwayland-brcm-egl TYPE platforms SOURCES diff --git a/src/plugins/platforms/qwayland-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-egl/CMakeLists.txt index 5a4e3626b..dd6bc049d 100644 --- a/src/plugins/platforms/qwayland-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandEglPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandEglPlatformIntegrationPlugin +qt_internal_add_plugin(QWaylandEglPlatformIntegrationPlugin OUTPUT_NAME qwayland-egl TYPE platforms SOURCES diff --git a/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt b/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt index a6d932cd7..6fe5c2466 100644 --- a/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt +++ b/src/plugins/platforms/qwayland-generic/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandIntegrationPlugin +qt_internal_add_plugin(QWaylandIntegrationPlugin OUTPUT_NAME qwayland-generic TYPE platforms SOURCES diff --git a/src/plugins/platforms/qwayland-generic/CMakeLists.txt b/src/plugins/platforms/qwayland-generic/CMakeLists.txt index 342e71189..0c2bb080f 100644 --- a/src/plugins/platforms/qwayland-generic/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-generic/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandIntegrationPlugin +qt_internal_add_plugin(QWaylandIntegrationPlugin OUTPUT_NAME qwayland-generic TYPE platforms DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wayland # special case diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt index 4b84b449d..a4ba2137d 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXCompositeEglPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin +qt_internal_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin OUTPUT_NAME qwayland-xcomposite-egl TYPE platforms SOURCES diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt index 1ff3c5ffc..e027e482b 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXCompositeGlxPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXCompositeGlxPlatformIntegrationPlugin +qt_internal_add_plugin(QWaylandXCompositeGlxPlatformIntegrationPlugin OUTPUT_NAME qwayland-xcomposite-glx TYPE platforms SOURCES diff --git a/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt b/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt index 9e068dfe2..686cfbcb6 100644 --- a/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt +++ b/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandFullScreenShellV1IntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandFullScreenShellV1IntegrationPlugin +qt_internal_add_plugin(QWaylandFullScreenShellV1IntegrationPlugin OUTPUT_NAME fullscreen-shell-v1 TYPE wayland-shell-integration SOURCES diff --git a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt index 4fe1016b0..9cc9e10df 100644 --- a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt +++ b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandIviShellIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandIviShellIntegrationPlugin +qt_internal_add_plugin(QWaylandIviShellIntegrationPlugin OUTPUT_NAME ivi-shell TYPE wayland-shell-integration SOURCES diff --git a/src/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/shellintegration/wl-shell/CMakeLists.txt index 496bbe68c..3e630c7c8 100644 --- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/plugins/shellintegration/wl-shell/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandWlShellIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandWlShellIntegrationPlugin +qt_internal_add_plugin(QWaylandWlShellIntegrationPlugin OUTPUT_NAME wl-shell TYPE wayland-shell-integration SOURCES diff --git a/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface.cpp b/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface.cpp index 48e14c753..245fec196 100644 --- a/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface.cpp +++ b/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface.cpp @@ -76,10 +76,11 @@ QWaylandWlShellSurface::~QWaylandWlShellSurface() delete m_extendedWindow; } -void QWaylandWlShellSurface::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) +bool QWaylandWlShellSurface::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) { enum resize resizeEdges = convertToResizeEdges(edges); resize(inputDevice->wl_seat(), inputDevice->serial(), resizeEdges); + return true; } bool QWaylandWlShellSurface::move(QWaylandInputDevice *inputDevice) diff --git a/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h b/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h index 324c10aac..ca7ba602c 100644 --- a/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h +++ b/src/plugins/shellintegration/wl-shell/qwaylandwlshellsurface_p.h @@ -76,7 +76,7 @@ public: ~QWaylandWlShellSurface() override; using QtWayland::wl_shell_surface::resize; - void resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override; + bool resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override; using QtWayland::wl_shell_surface::move; bool move(QWaylandInputDevice *inputDevice) override; diff --git a/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt index fec8b2c89..231bac087 100644 --- a/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt +++ b/src/plugins/shellintegration/xdg-shell-v5/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXdgShellV5IntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXdgShellV5IntegrationPlugin +qt_internal_add_plugin(QWaylandXdgShellV5IntegrationPlugin OUTPUT_NAME xdg-shell-v5 TYPE wayland-shell-integration SOURCES diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp index e8bff9193..770fad7e8 100644 --- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp +++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp @@ -82,10 +82,11 @@ QtWayland::xdg_surface_v5::resize_edge QWaylandXdgSurfaceV5::convertToResizeEdge | ((edges & Qt::RightEdge) ? resize_edge_right : 0)); } -void QWaylandXdgSurfaceV5::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) +bool QWaylandXdgSurfaceV5::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) { resize_edge resizeEdges = convertToResizeEdges(edges); resize(inputDevice->wl_seat(), inputDevice->serial(), resizeEdges); + return true; } bool QWaylandXdgSurfaceV5::move(QWaylandInputDevice *inputDevice) diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5_p.h index feebee7f4..bf221079e 100644 --- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5_p.h +++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5_p.h @@ -80,7 +80,7 @@ public: using QtWayland::xdg_surface_v5::resize; static resize_edge convertToResizeEdges(Qt::Edges edges); - void resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override; + bool resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override; using QtWayland::xdg_surface_v5::move; bool move(QWaylandInputDevice *inputDevice) override; diff --git a/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt index 094610155..190c6698f 100644 --- a/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt +++ b/src/plugins/shellintegration/xdg-shell-v6/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXdgShellV6IntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXdgShellV6IntegrationPlugin +qt_internal_add_plugin(QWaylandXdgShellV6IntegrationPlugin OUTPUT_NAME xdg-shell-v6 TYPE wayland-shell-integration SOURCES diff --git a/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp b/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp index dc3cfdbfa..c137b308b 100644 --- a/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp +++ b/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp @@ -237,11 +237,14 @@ QWaylandXdgSurfaceV6::~QWaylandXdgSurfaceV6() destroy(); } -void QWaylandXdgSurfaceV6::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) +bool QWaylandXdgSurfaceV6::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) { - Q_ASSERT(m_toplevel && m_toplevel->isInitialized()); + if (!m_toplevel || !m_toplevel->isInitialized()) + return false; + auto resizeEdges = Toplevel::convertToResizeEdges(edges); m_toplevel->resize(inputDevice->wl_seat(), inputDevice->serial(), resizeEdges); + return true; } bool QWaylandXdgSurfaceV6::move(QWaylandInputDevice *inputDevice) diff --git a/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h b/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h index f77a4d4ba..757b982b9 100644 --- a/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h +++ b/src/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h @@ -77,7 +77,7 @@ public: QWaylandXdgSurfaceV6(QWaylandXdgShellV6 *shell, ::zxdg_surface_v6 *surface, QWaylandWindow *window); ~QWaylandXdgSurfaceV6() override; - void resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override; + bool resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override; bool move(QWaylandInputDevice *inputDevice) override; bool showWindowMenu(QWaylandInputDevice *seat) override; void setTitle(const QString &title) override; diff --git a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt index 848a0ec60..1b55b8eb7 100644 --- a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt +++ b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt @@ -4,7 +4,7 @@ ## QWaylandXdgShellIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QWaylandXdgShellIntegrationPlugin +qt_internal_add_plugin(QWaylandXdgShellIntegrationPlugin OUTPUT_NAME xdg-shell TYPE wayland-shell-integration SOURCES diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp index bd1f5a210..b6d23ac10 100644 --- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp @@ -56,10 +56,11 @@ QWaylandXdgSurface::Toplevel::Toplevel(QWaylandXdgSurface *xdgSurface) : QtWayland::xdg_toplevel(xdgSurface->get_toplevel()) , m_xdgSurface(xdgSurface) { - if (auto *decorationManager = m_xdgSurface->m_shell->decorationManager()) - m_decoration = decorationManager->createToplevelDecoration(object()); - QWindow *window = xdgSurface->window()->window(); + if (auto *decorationManager = m_xdgSurface->m_shell->decorationManager()) { + if (!(window->flags() & Qt::FramelessWindowHint)) + m_decoration = decorationManager->createToplevelDecoration(object()); + } requestWindowStates(window->windowStates()); requestWindowFlags(window->flags()); } @@ -155,10 +156,12 @@ void QWaylandXdgSurface::Toplevel::xdg_toplevel_close() void QWaylandXdgSurface::Toplevel::requestWindowFlags(Qt::WindowFlags flags) { if (m_decoration) { - if (flags & Qt::FramelessWindowHint) - m_decoration->requestMode(QWaylandXdgToplevelDecorationV1::mode_client_side); - else + if (flags & Qt::FramelessWindowHint) { + delete m_decoration; + m_decoration = nullptr; + } else { m_decoration->unsetMode(); + } } } @@ -266,11 +269,14 @@ QWaylandXdgSurface::~QWaylandXdgSurface() destroy(); } -void QWaylandXdgSurface::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) +bool QWaylandXdgSurface::resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) { - Q_ASSERT(m_toplevel && m_toplevel->isInitialized()); + if (!m_toplevel || !m_toplevel->isInitialized()) + return false; + auto resizeEdges = Toplevel::convertToResizeEdges(edges); m_toplevel->resize(inputDevice->wl_seat(), inputDevice->serial(), resizeEdges); + return true; } bool QWaylandXdgSurface::move(QWaylandInputDevice *inputDevice) diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h index 8f8682a47..0c98be35c 100644 --- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h +++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h @@ -80,7 +80,7 @@ public: QWaylandXdgSurface(QWaylandXdgShell *shell, ::xdg_surface *surface, QWaylandWindow *window); ~QWaylandXdgSurface() override; - void resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override; + bool resize(QWaylandInputDevice *inputDevice, Qt::Edges edges) override; bool move(QWaylandInputDevice *inputDevice) override; bool showWindowMenu(QWaylandInputDevice *seat) override; void setTitle(const QString &title) override; |