1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename xdg-shell.xml to xdg-shell-unstable-v5.xml

Browse Source 
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>
This commit is contained in:
Johan Klokkhammer Helsing 2018-05-09 14:01:07 +02:00 committed by Johan Helsing
parent 7ef6c33a69
commit 08d02f5392
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/wayland/protocols/qt_attribution.json vendored
View File

@ -41,7 +41,7 @@ Copyright (c) 2013 BMW Car IT GmbH"
"Name": "Wayland XDG Shell Protocol", "Name": "Wayland XDG Shell Protocol",
"QDocModule": "qtwaylandcompositor", "QDocModule": "qtwaylandcompositor",
"QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.", "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.", "Description": "The XDG-Shell protocol is an extended way to manage surfaces under Wayland compositors.",
"Homepage": "https://wayland.freedesktop.org", "Homepage": "https://wayland.freedesktop.org",

2
src/3rdparty/wayland/protocols/xdg-shell.xml → src/3rdparty/wayland/protocols/xdg-shell-unstable-v5.xml vendored
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<protocol name="xdg_shell"> <protocol name="xdg_shell_unstable_v5">
<copyright> <copyright>
Copyright © 2008-2013 Kristian Høgsberg Copyright © 2008-2013 Kristian Høgsberg

2
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include "qwayland-xdg-shell.h" #include "qwayland-xdg-shell-unstable-v5.h"
#include <wayland-client.h> #include <wayland-client.h>

2
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include "qwayland-xdg-shell.h" #include "qwayland-xdg-shell-unstable-v5.h"
#include <QtCore/QSize> #include <QtCore/QSize>
#include <QtCore/QVector> #include <QtCore/QVector>

2
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h
View File

@ -51,7 +51,7 @@
// We mean it. // We mean it.
// //
#include "qwayland-xdg-shell.h" #include "qwayland-xdg-shell-unstable-v5.h"
#include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtWaylandClient/qtwaylandclientglobal.h>
#include <QtWaylandClient/private/qwaylandshellsurface_p.h> #include <QtWaylandClient/private/qwaylandshellsurface_p.h>

2
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
View File

@ -7,7 +7,7 @@ qtConfig(xkbcommon-evdev): \
QMAKE_USE += xkbcommon_evdev QMAKE_USE += xkbcommon_evdev
WAYLANDCLIENTSOURCES += \ WAYLANDCLIENTSOURCES += \
../../../3rdparty/protocol/xdg-shell.xml ../../../3rdparty/protocol/xdg-shell-unstable-v5.xml
HEADERS += \ HEADERS += \
qwaylandxdgpopup_p.h \ qwaylandxdgpopup_p.h \