diff options
author | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2014-06-10 16:22:17 +0200 |
---|---|---|
committer | Philippe Coval <rzr@gna.org> | 2014-06-20 13:52:38 +0200 |
commit | 4bac130b97fbaa565aa9883eb302557ef0185d50 (patch) | |
tree | 9bc1e72dab7ea574719b67fb47306ea95d4260c7 /src/client/qwaylanddisplay_p.h | |
parent | b3a493786accafc5771d8242ee558b87265aa8f2 (diff) |
xdg-shell: upgrade to support current version (weston-1.5.0)
The protocol file is a raw copy of
Source: http://cgit.freedesktop.org/wayland/weston/plain/protocol/xdg-shell.xml?id=1.5.0
Task-number: QTBUG-38633/related
Change-Id: I41ca2f89c09a8b6348ce2fbf6d59f44b4c8134df
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Reviewed-by: Philippe Coval <rzr@gna.org>
Diffstat (limited to 'src/client/qwaylanddisplay_p.h')
-rw-r--r-- | src/client/qwaylanddisplay_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index cf5dfc21d..f1b35a712 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -72,6 +72,7 @@ class QWaylandWindow; class QWaylandEventThread; class QWaylandIntegration; class QWaylandHardwareIntegration; +class QWaylandXdgShell; namespace QtWayland { class qt_output_extension; @@ -115,7 +116,7 @@ public: QtWayland::wl_compositor *compositor() { return &mCompositor; } QtWayland::wl_shell *shell() { return mShell.data(); } - QtWayland::xdg_shell *shellXdg() { return mShellXdg.data(); } + QtWayland::xdg_shell *shellXdg(); QList<QWaylandInputDevice *> inputDevices() const { return mInputDevices; } QWaylandInputDevice *defaultInputDevice() const; @@ -171,7 +172,7 @@ private: QThread *mEventThread; QWaylandEventThread *mEventThreadObject; QScopedPointer<QtWayland::wl_shell> mShell; - QScopedPointer<QtWayland::xdg_shell> mShellXdg; + QScopedPointer<QWaylandXdgShell> mShellXdg; QList<QPlatformScreen *> mScreens; QList<QWaylandInputDevice *> mInputDevices; QList<Listener> mRegistryListeners; |