summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-05-09 14:01:07 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-05-14 12:17:36 +0000
commit0336b6bfaf6e2c728cc343f8018aa8832b7c5f01 (patch)
tree8171c8b3f42a404a9729dbe16cbfd72c6de8319b /src/3rdparty
parentf76bb443771616eda6fdce6dc6823925f2e6528d (diff)
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 <paul.tvete@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/protocol/qt_attribution.json2
-rw-r--r--src/3rdparty/protocol/xdg-shell-unstable-v5.xml (renamed from src/3rdparty/protocol/xdg-shell.xml)2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/protocol/qt_attribution.json b/src/3rdparty/protocol/qt_attribution.json
index f35dec4f3..94d77f609 100644
--- a/src/3rdparty/protocol/qt_attribution.json
+++ b/src/3rdparty/protocol/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/protocol/xdg-shell.xml b/src/3rdparty/protocol/xdg-shell-unstable-v5.xml
index f98e760d4..89c9d58c5 100644
--- a/src/3rdparty/protocol/xdg-shell.xml
+++ b/src/3rdparty/protocol/xdg-shell-unstable-v5.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="xdg_shell">
+<protocol name="xdg_shell_unstable_v5">
<copyright>
Copyright © 2008-2013 Kristian Høgsberg