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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/auto/compositor/compositor/compositor.pro | 2 | ||||
| -rw-r--r-- | tests/auto/compositor/compositor/mockclient.h | 2 | ||||
| -rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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> |