diff options
author | Jorgen Lind <jorgen.lind@gmail.com> | 2012-07-05 11:59:25 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-07-06 19:29:18 +0200 |
commit | 61d9acc0df8dec6cda5f563eef326b951e6ec4f8 (patch) | |
tree | 167693b6df19ba0f05207cc8e91d141aed7dd394 | |
parent | 10f72c1c9d47897deb7155556c99d2fee39aabfa (diff) | |
download | qtwayland-61d9acc0df8dec6cda5f563eef326b951e6ec4f8.tar.gz |
Update wayland sha
Change-Id: Icf48c40b4d078b13c4132e52d351a22395d4ca76
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
-rw-r--r-- | src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp | 12 | ||||
-rw-r--r-- | src/plugins/platforms/wayland/qwaylanddatadevicemanager.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandshellsurface.cpp | 2 | ||||
-rw-r--r-- | wayland_sha1.txt | 2 |
4 files changed, 5 insertions, 13 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp index 2c5cb9ea..12180c41 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp +++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp @@ -60,19 +60,11 @@ void QWaylandDataDeviceManager::data_offer(void *data, struct wl_data_device *data_device, - uint32_t id) + struct wl_data_offer *id) { - QWaylandDataDeviceManager *handler = static_cast<QWaylandDataDeviceManager *>(data); - //this will be hidden with a wl function call in the near future I hope, but I suppose the scanner - //doesn't support it yet - struct wl_proxy *newId = wl_proxy_create_for_id(reinterpret_cast<struct wl_proxy *>(data_device), - id, &wl_data_offer_interface); - struct wl_data_offer *data_offer = - reinterpret_cast<struct wl_data_offer *>(newId); - - new QWaylandDataOffer(handler->display(),data_offer); + new QWaylandDataOffer(handler->display(),id); } void QWaylandDataDeviceManager::enter(void *data, diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h index 7db3dfc1..f50037a0 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h +++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h @@ -96,7 +96,7 @@ private: static void data_offer(void *data, struct wl_data_device *wl_data_device, - uint32_t id); + struct wl_data_offer *id); static void enter(void *data, struct wl_data_device *wl_data_device, uint32_t time, diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp index e443e776..4700c3f8 100644 --- a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp +++ b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp @@ -101,7 +101,7 @@ void QWaylandShellSurface::updateTransientParent(QWindow *parent) flags |= WL_SHELL_SURFACE_TRANSIENT_INACTIVE; wl_shell_surface_set_transient(m_shell_surface, - parent_wayland_window->shellSurface()->m_shell_surface, + parent_wayland_window->wl_surface(), transientPos.x(), transientPos.y(), flags); diff --git a/wayland_sha1.txt b/wayland_sha1.txt index 24bcbc90..5198b733 100644 --- a/wayland_sha1.txt +++ b/wayland_sha1.txt @@ -1,3 +1,3 @@ This version of Qt-Compositor is checked against the following sha1 from the Wayland repository: -b576443a0eb848085d0fcdf2b2d2987bcfb58a7f +8a023688c07fe2d377c4bc9631ce2fe7a9afee60 |