From 39b50c36bda73ced9565757f379285b9b1b66087 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 15 Aug 2019 14:14:23 +0200 Subject: [PATCH 1/2] Make it possible to build only the compositor module Reduces unnecessary coupling between the compositor and client modules. [ChangeLog][Compositor] The compositor module no longer depends on the client module. Change-Id: I108e56960835b6c31c450d5ae08a0a101af9422b Reviewed-by: Johan Helsing Reviewed-by: Paul Olav Tvete --- tests/auto/wayland/inputcontext/inputcontext.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/auto/wayland/inputcontext/inputcontext.pro b/tests/auto/wayland/inputcontext/inputcontext.pro index 4419b3e77ad..1971d455ead 100644 --- a/tests/auto/wayland/inputcontext/inputcontext.pro +++ b/tests/auto/wayland/inputcontext/inputcontext.pro @@ -1,6 +1,4 @@ include (../shared/shared.pri) -QT += waylandcompositor - TARGET = tst_inputcontext SOURCES += tst_inputcontext.cpp From 963829b27da7d0223d72ec3c1d6a18b45f123ddb Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Wed, 16 Jan 2019 08:34:11 +0100 Subject: [PATCH 2/2] Compositor: Add xdg-output unstable v1 support We already have a client-side implementation in the QPA plugin, and now we add the server-side implementation. In order to have a nice declarative API, we let users create a XdgOutputV1 instance and then associate it with the zxdg_output_v1 object when it is requested by the client. If the user forgets to create XdgOutputV1 beforehand we post an error to the client. To anticipate protocol version 3, we send zxdg_output_v1.done when we send wl_output.done. The multi-output example is extended using this protocol. [ChangeLog][Compositor] Added support for xdg-output unstable v1 Wayland extension. Change-Id: I1ec5913d8330cc01d7d634d05a289f4dc8b4fd22 Reviewed-by: Johan Helsing --- src/3rdparty/wayland/protocols/qt_attribution.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/wayland/protocols/qt_attribution.json b/src/3rdparty/wayland/protocols/qt_attribution.json index e6f90698b89..c49ead4f33d 100644 --- a/src/3rdparty/wayland/protocols/qt_attribution.json +++ b/src/3rdparty/wayland/protocols/qt_attribution.json @@ -127,8 +127,9 @@ Copyright (c) 2013 BMW Car IT GmbH" "Id": "wayland-xdg-output-protocol", "Name": "Wayland XDG Output Protocol", "QDocModule": "qtwaylandcompositor", - "QtUsage": "Used in the Qt Wayland platform plugin.", + "QtUsage": "Used in the Qt Wayland Compositor API, and the Qt Wayland platform plugin.", "Files": "xdg-output-unstable-v1.xml", + "Description": "The XDG Output protocol is an extended way to describe output regions under Wayland", "Homepage": "https://wayland.freedesktop.org", "Version": "unstable v1, version 2",