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 /examples/wayland/server-buffer/client/main.cpp | |
| 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 'examples/wayland/server-buffer/client/main.cpp')
| -rw-r--r-- | examples/wayland/server-buffer/client/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/wayland/server-buffer/client/main.cpp b/examples/wayland/server-buffer/client/main.cpp index 3f7a94d03..1a2c447a7 100644 --- a/examples/wayland/server-buffer/client/main.cpp +++ b/examples/wayland/server-buffer/client/main.cpp @@ -95,7 +95,6 @@ public: QtWaylandClient::QWaylandDisplay *wayland_display = wayland_integration->display(); struct ::wl_registry *registry = wl_display_get_registry(wayland_display->wl_display()); - wl_proxy_set_queue(reinterpret_cast<struct wl_proxy *>(registry), wayland_display->wl_event_queue()); QtWayland::wl_registry::init(registry); } |