From f11c2993d2173d97ab74a36cac5603dff1c32997 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 8 May 2018 16:31:16 +0200 Subject: Move xdg-shell-v5 to a plugin This is the first step in deprecating xdg-shell unstable v5 and making the good names available for the good names for xdg-shell stable. Shell initialization has been refactored slightly, so the QWaylandShellIntegrationFactory actually tries to initialize the shell integration before returning it. Similarly for the factory method of non-plugin shells. Change-Id: I85e60594c4fc03c6f302c04316110aed428d28dc Reviewed-by: Paul Olav Tvete --- .../shellintegration/xdg-shell-v5/xdg-shell-v5.pro | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro (limited to 'src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro') diff --git a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro new file mode 100644 index 000000000..85052fef6 --- /dev/null +++ b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro @@ -0,0 +1,30 @@ +QT += gui-private waylandclient-private +CONFIG += wayland-scanner + +QMAKE_USE += wayland-client + +qtConfig(xkbcommon-evdev): \ + QMAKE_USE += xkbcommon_evdev + +WAYLANDCLIENTSOURCES += \ + ../../../3rdparty/protocol/xdg-shell.xml + +HEADERS += \ + qwaylandxdgpopup_p.h \ + qwaylandxdgshell_p.h \ + qwaylandxdgshellintegration_p.h \ + qwaylandxdgsurface_p.h \ + +SOURCES += \ + main.cpp \ + qwaylandxdgpopup.cpp \ + qwaylandxdgshell.cpp \ + qwaylandxdgshellintegration.cpp \ + qwaylandxdgsurface.cpp \ + +OTHER_FILES += \ + xdg-shell-v5.json + +PLUGIN_TYPE = wayland-shell-integration +PLUGIN_CLASS_NAME = QWaylandXdgShellV5IntegrationPlugin +load(qt_plugin) -- cgit v1.2.3