diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:47:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 12:24:42 +0200 |
commit | 6169341cbbeebdd6deed7c012b2ba79e1f6d95ff (patch) | |
tree | dd3dd688eabf504913df465bb1a384521fcafda4 /src/client/qwaylanddisplay_p.h | |
parent | 87499ddd653fb20796c2dd2eabac37b45240ef1c (diff) | |
parent | 3dc9cfdbd2771c28c770d432b99e571db43fe599 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Conflicts:
src/client/qwaylandwindow.cpp
Change-Id: I80ead87f3e1f36299b1bf9cc9c7db6cd48c0e86f
Diffstat (limited to 'src/client/qwaylanddisplay_p.h')
-rw-r--r-- | src/client/qwaylanddisplay_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 96d79ddbd..84c79d70d 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -109,7 +109,6 @@ public: void setCursor(struct wl_buffer *buffer, struct wl_cursor_image *image); struct wl_display *wl_display() const { return mDisplay; } - struct wl_event_queue *wl_event_queue() const { return mEventQueue; } struct ::wl_registry *wl_registry() { return object(); } const struct wl_compositor *wl_compositor() const { return mCompositor.object(); } @@ -174,7 +173,6 @@ private: }; struct wl_display *mDisplay; - struct wl_event_queue *mEventQueue; QtWayland::wl_compositor mCompositor; struct wl_shm *mShm; QThread *mEventThread; |