diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-05-09 14:01:07 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-05-14 12:17:36 +0000 |
| commit | 0336b6bfaf6e2c728cc343f8018aa8832b7c5f01 (patch) | |
| tree | 8171c8b3f42a404a9729dbe16cbfd72c6de8319b /src/compositor/extensions | |
| parent | f76bb443771616eda6fdce6dc6823925f2e6528d (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/compositor/extensions')
| -rw-r--r-- | src/compositor/extensions/extensions.pri | 2 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv5_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
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> |