diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-10-31 08:41:18 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-11-30 10:28:21 +0100 |
| commit | 33d06a071c72998241654952322a58ce888a1f16 (patch) | |
| tree | 48459b83eb9cde9b20556e44058ebded17239ffa /src/plugins/platforms/wayland/qwaylandwindow.h | |
| parent | cf17f0c195ff6535c64da11c24161705cbb6d645 (diff) | |
Updated to head of Wayland, but did not fix clipboard or dnd
Change-Id: I9f4d4101947b2cc64b52eed070d3a37c00ab07da
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandwindow.h')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandwindow.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow.h index 4f1e2c818..20d0beb27 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.h +++ b/src/plugins/platforms/wayland/qwaylandwindow.h @@ -84,10 +84,12 @@ protected: QWaylandBuffer *mBuffer; WId mWindowId; bool mWaitingForFrameSync; + struct wl_callback *mFrameCallback; QWaitCondition mFrameSyncWait; private: - static void frameCallback(struct wl_surface *surface, void *data, uint32_t time); + static const wl_callback_listener callbackListener; + static void frameCallback(void *data, struct wl_callback *wl_callback, uint32_t time); }; |