Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1

Conflicts:
	src/client/qwaylandwindow.cpp

Change-Id: I80ead87f3e1f36299b1bf9cc9c7db6cd48c0e86f

1 files changed, 4 insertions, 10 deletions

diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index ab69bca32..2d1c81a75 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -154,12 +154,7 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
     mEventThreadObject->displayConnect();
     mDisplay = mEventThreadObject->display(); //blocks until display is available
 
-    //Create a new even queue for the QtGui thread
-    mEventQueue = wl_display_create_queue(mDisplay);
-
     struct ::wl_registry *registry = wl_display_get_registry(mDisplay);
-    wl_proxy_set_queue((struct wl_proxy *)registry, mEventQueue);
-
     init(registry);
 
     connect(mEventThreadObject, SIGNAL(newEventsRead()), this, SLOT(flushRequests()));
@@ -187,7 +182,7 @@ QWaylandDisplay::~QWaylandDisplay(void)
 
 void QWaylandDisplay::flushRequests()
 {
-    if (wl_display_dispatch_queue_pending(mDisplay, mEventQueue) < 0) {
+    if (wl_display_dispatch_pending(mDisplay) < 0) {
         mEventThreadObject->checkError();
         exitWithError();
     }
@@ -198,7 +193,7 @@ void QWaylandDisplay::flushRequests()
 
 void QWaylandDisplay::blockingReadEvents()
 {
-    if (wl_display_dispatch_queue(mDisplay, mEventQueue) < 0) {
+    if (wl_display_dispatch(mDisplay) < 0) {
         mEventThreadObject->checkError();
         exitWithError();
     }
@@ -348,17 +343,16 @@ void QWaylandDisplay::forceRoundTrip()
     int ret = 0;
     bool done = false;
     wl_callback *callback = wl_display_sync(mDisplay);
-    wl_proxy_set_queue((struct wl_proxy *)callback, mEventQueue);
     wl_callback_add_listener(callback, &sync_listener, &done);
     flushRequests();
     if (QThread::currentThread()->eventDispatcher()) {
         while (!done && ret >= 0) {
             QThread::currentThread()->eventDispatcher()->processEvents(QEventLoop::WaitForMoreEvents);
-            ret = wl_display_dispatch_queue_pending(mDisplay, mEventQueue);
+            ret = wl_display_dispatch_pending(mDisplay);
         }
     } else {
         while (!done && ret >= 0)
-            ret = wl_display_dispatch_queue(mDisplay, mEventQueue);
+            ret = wl_display_dispatch(mDisplay);
     }
 
     if (ret == -1 && !done)