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.h | |
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.h')
-rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h index fc26ad2..481f829 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.h +++ b/src/plugins/platforms/wayland/qwaylanddisplay.h @@ -63,7 +63,7 @@ public: void createNewScreen(struct wl_output *output, QRect geometry); QList<QPlatformScreen *> screens() const { return mScreens; } - struct wl_surface *createSurface(); + struct wl_surface *createSurface(void *handle); struct wl_buffer *createShmBuffer(int fd, int width, int height, uint32_t stride, struct wl_visual *visual); |