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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 88b4e3889..2c1a26e24 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -50,7 +50,7 @@ #include "qwaylandclipboard_p.h" #include "qwaylanddatadevicemanager_p.h" #include "qwaylandhardwareintegration_p.h" - +#include "qwaylandxdgshell_p.h" #include "qwaylandwindowmanagerintegration_p.h" @@ -209,8 +209,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin mShm = static_cast<struct wl_shm *>(wl_registry_bind(registry, id, &wl_shm_interface,1)); } else if (interface == QStringLiteral("xdg_shell") && qEnvironmentVariableIsSet("QT_WAYLAND_USE_XDG_SHELL")) { - mShellXdg.reset(new QtWayland::xdg_shell(registry, id)); - mShellXdg->use_unstable_version(QtWayland::xdg_shell::version_current); + mShellXdg.reset(new QWaylandXdgShell(registry,id)); } else if (interface == QStringLiteral("wl_shell")){ mShell.reset(new QtWayland::wl_shell(registry, id)); } else if (interface == QStringLiteral("wl_seat")) { @@ -275,4 +274,9 @@ void QWaylandDisplay::forceRoundTrip() wl_display_roundtrip(mDisplay); } +QtWayland::xdg_shell *QWaylandDisplay::shellXdg() +{ + return mShellXdg.data(); +} + QT_END_NAMESPACE |