diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-04 10:13:48 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-04 10:21:05 (GMT) |
| commit | cc46428d5b421b3ebc3a2ff3171b5197af008022 (patch) | |
| tree | 023967d9dc6ce574396afa4990e564cf962cd6a5 /src/plugins/platforms/wayland/qwaylanddisplay.cpp | |
| parent | 991f59a295e7678165b1db7befc9beac8bdbe503 (diff) | |
| download | Qt-cc46428d5b421b3ebc3a2ff3171b5197af008022.zip Qt-cc46428d5b421b3ebc3a2ff3171b5197af008022.tar.gz Qt-cc46428d5b421b3ebc3a2ff3171b5197af008022.tar.bz2 | |
Wayland: Allways have a userPtr for QWaylandWindow
So that we can use it without having to check for 0 in input handling
Conflicts:
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylanddisplay.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index e3b2d46..b79f355 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -54,9 +54,11 @@ #include <fcntl.h> #include <stdio.h> -struct wl_surface *QWaylandDisplay::createSurface() +struct wl_surface *QWaylandDisplay::createSurface(void *handle) { - return wl_compositor_create_surface(mCompositor); + struct wl_surface * surface = wl_compositor_create_surface(mCompositor); + wl_surface_set_user_data(surface, handle); + return surface; } struct wl_buffer *QWaylandDisplay::createShmBuffer(int fd, |