summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/wayland/qwaylanddisplay.h
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2011-03-14 15:55:19 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2011-03-14 15:55:19 (GMT)
commit369ad09515fc8dac87613930114f4b3cf6381e81 (patch)
tree9c623f2c9a7e4863f0a18cb0b53114644cfff24b /src/plugins/platforms/wayland/qwaylanddisplay.h
parent48ebe36a8b5d101c5dcad26d88d6fc0504fc9319 (diff)
downloadQt-369ad09515fc8dac87613930114f4b3cf6381e81.zip
Qt-369ad09515fc8dac87613930114f4b3cf6381e81.tar.gz
Qt-369ad09515fc8dac87613930114f4b3cf6381e81.tar.bz2
Fix race condition in the non-GL case
Make sure to also flush output when waiting for an ack from the compositor, in case we haven't sent the frame request yet. Reviewed-by: Jørgen
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylanddisplay.h')
-rw-r--r--src/plugins/platforms/wayland/qwaylanddisplay.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h
index ca31756..d994ffe 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.h
@@ -81,8 +81,10 @@ public:
void syncCallback(wl_display_sync_func_t func, void *data);
void frameCallback(wl_display_frame_func_t func, void *data);
+ void iterate();
+
public slots:
- void eventDispatcher(void);
+ void readEvents(void);
void flushRequests(void);
private: