From 08d02f539273f5f516e135e57a06e90c13e86462 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 9 May 2018 14:01:07 +0200 Subject: [PATCH] Rename xdg-shell.xml to xdg-shell-unstable-v5.xml Also change the protocol name in the xml file from xdg_shell to xdg_shell_unstable_v5 (similar pattern as v6) because qtwaylandscanner doesn't support the file name being different from the protocol name. Change-Id: I1d9edf7c8ca512e716284250a2b2bc13e205c33c Reviewed-by: Paul Olav Tvete --- src/3rdparty/wayland/protocols/qt_attribution.json | 2 +- .../protocols/{xdg-shell.xml => xdg-shell-unstable-v5.xml} | 2 +- .../plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h | 2 +- .../plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h | 2 +- .../shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h | 2 +- .../plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/3rdparty/wayland/protocols/{xdg-shell.xml => xdg-shell-unstable-v5.xml} (99%) diff --git a/src/3rdparty/wayland/protocols/qt_attribution.json b/src/3rdparty/wayland/protocols/qt_attribution.json index f35dec4f348..94d77f6097b 100644 --- a/src/3rdparty/wayland/protocols/qt_attribution.json +++ b/src/3rdparty/wayland/protocols/qt_attribution.json @@ -41,7 +41,7 @@ Copyright (c) 2013 BMW Car IT GmbH" "Name": "Wayland XDG Shell Protocol", "QDocModule": "qtwaylandcompositor", "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.", - "Files": "xdg-shell.xml", + "Files": "xdg-shell-unstable-v5.xml xdg-shell-unstable-v6.xml", "Description": "The XDG-Shell protocol is an extended way to manage surfaces under Wayland compositors.", "Homepage": "https://wayland.freedesktop.org", diff --git a/src/3rdparty/wayland/protocols/xdg-shell.xml b/src/3rdparty/wayland/protocols/xdg-shell-unstable-v5.xml similarity index 99% rename from src/3rdparty/wayland/protocols/xdg-shell.xml rename to src/3rdparty/wayland/protocols/xdg-shell-unstable-v5.xml index f98e760d482..89c9d58c52e 100644 --- a/src/3rdparty/wayland/protocols/xdg-shell.xml +++ b/src/3rdparty/wayland/protocols/xdg-shell-unstable-v5.xml @@ -1,5 +1,5 @@ - + Copyright © 2008-2013 Kristian Høgsberg diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h index d9f7deec642..f7ea05c9ef7 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qwayland-xdg-shell.h" +#include "qwayland-xdg-shell-unstable-v5.h" #include diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h index 9341c7a8fb4..ead1e65d712 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qwayland-xdg-shell.h" +#include "qwayland-xdg-shell-unstable-v5.h" #include #include diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h index cf4498a8372..0153c80b1ad 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qwayland-xdg-shell.h" +#include "qwayland-xdg-shell-unstable-v5.h" #include #include diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro index 85052fef6f3..511699b2dbf 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro @@ -7,7 +7,7 @@ qtConfig(xkbcommon-evdev): \ QMAKE_USE += xkbcommon_evdev WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/xdg-shell.xml + ../../../3rdparty/protocol/xdg-shell-unstable-v5.xml HEADERS += \ qwaylandxdgpopup_p.h \