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>

11 files changed, 11 insertions, 11 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
diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri
index 68e473e14..233b4bb41 100644
--- a/src/compositor/extensions/extensions.pri
+++ b/src/compositor/extensions/extensions.pri
@@ -6,7 +6,7 @@ WAYLANDSERVERSOURCES += \
     ../extensions/qtkey-extension.xml \
     ../extensions/qt-windowmanager.xml \
     ../3rdparty/protocol/text-input-unstable-v2.xml \
-    ../3rdparty/protocol/xdg-shell.xml \
+    ../3rdparty/protocol/xdg-shell-unstable-v5.xml \
     ../3rdparty/protocol/xdg-shell-unstable-v6.xml \
     ../3rdparty/protocol/ivi-application.xml \
 
diff --git a/src/compositor/extensions/qwaylandxdgshellv5_p.h b/src/compositor/extensions/qwaylandxdgshellv5_p.h
index b0b51698d..032441e8d 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv5_p.h
@@ -41,7 +41,7 @@
 #define QWAYLANDXDGSHELLV5_P_H
 
 #include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h>
-#include <QtWaylandCompositor/private/qwayland-server-xdg-shell.h>
+#include <QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v5.h>
 
 #include <QtWaylandCompositor/QWaylandXdgShellV5>
 
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h
index d9f7deec6..f7ea05c9e 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h
+++ b/src/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 <wayland-client.h>
 
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h
index 9341c7a8f..ead1e65d7 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h
+++ b/src/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 <QtCore/QSize>
 #include <QtCore/QVector>
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h
index cf4498a83..0153c80b1 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h
+++ b/src/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 <QtWaylandClient/qtwaylandclientglobal.h>
 #include <QtWaylandClient/private/qwaylandshellsurface_p.h>
diff --git a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
index 85052fef6..511699b2d 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
+++ b/src/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 \
diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro
index 68b18c974..d69db4ca5 100644
--- a/tests/auto/compositor/compositor/compositor.pro
+++ b/tests/auto/compositor/compositor/compositor.pro
@@ -11,7 +11,7 @@ qtConfig(xkbcommon-evdev): \
     QMAKE_USE += xkbcommon_evdev
 
 WAYLANDCLIENTSOURCES += \
-            ../../../../src/3rdparty/protocol/xdg-shell.xml \
+            ../../../../src/3rdparty/protocol/xdg-shell-unstable-v5.xml \
             ../../../../src/3rdparty/protocol/ivi-application.xml \
 
 SOURCES += \
diff --git a/tests/auto/compositor/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h
index 6d5bf31df..6bfb652ed 100644
--- a/tests/auto/compositor/compositor/mockclient.h
+++ b/tests/auto/compositor/compositor/mockclient.h
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <wayland-client.h>
-#include <wayland-xdg-shell-client-protocol.h>
+#include <qwayland-xdg-shell-unstable-v5.h>
 #include <wayland-ivi-application-client-protocol.h>
 
 #include <QObject>
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 2f00f2a83..d1f501e24 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -46,7 +46,7 @@
 #include <QtWaylandCompositor/QWaylandSurface>
 #include <QtWaylandCompositor/QWaylandResource>
 #include <QtWaylandCompositor/QWaylandKeymap>
-#include <qwayland-xdg-shell.h>
+#include <qwayland-xdg-shell-unstable-v5.h>
 #include <qwayland-ivi-application.h>
 
 #include <QtTest/QtTest>