Compile after QWindowSystemInterface API changes.

Change-Id: I71024a4f36d4952c70b3dc3caa2156e2e7c9b837
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp b/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
index ca1077b..1d3bd6d 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
@@ -147,10 +147,11 @@ void QWaylandExtendedSurface::onscreen_visibility(void *data, wl_extended_surfac
 
     extendedWindow->m_exposed = visible;
     QWaylandWindow *w = extendedWindow->m_window;
-    QWindowSystemInterface::handleSynchronousExposeEvent(w->window(),
-                                                         visible
-                                                         ? QRegion(w->geometry())
-                                                         : QRegion());
+    QWindowSystemInterface::handleExposeEvent(w->window(),
+                                              visible
+                                              ? QRegion(w->geometry())
+                                              : QRegion());
+    QWindowSystemInterface::flushWindowSystemEvents();
 }
 
 void QWaylandExtendedSurface::set_generic_property(void *data, wl_extended_surface *wl_extended_surface, const char *name, wl_array *value)

diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 05781ff..7fae0a4 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -158,13 +158,16 @@ void QWaylandWindow::setVisible(bool visible)
             wl_surface_attach(mSurface, mBuffer->buffer(), 0, 0);
 
         if (!mSentInitialResize) {
-            QWindowSystemInterface::handleSynchronousGeometryChange(window(), geometry());
+            QWindowSystemInterface::handleGeometryChange(window(), geometry());
+            QWindowSystemInterface::flushWindowSystemEvents();
             mSentInitialResize = true;
         }
 
-        QWindowSystemInterface::handleSynchronousExposeEvent(window(), QRect(QPoint(), geometry().size()));
+        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
+        QWindowSystemInterface::flushWindowSystemEvents();
     } else {
-        QWindowSystemInterface::handleSynchronousExposeEvent(window(), QRect(QPoint(), geometry().size()));
+        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
+        QWindowSystemInterface::flushWindowSystemEvents();
         wl_surface_attach(mSurface, 0,0,0);
         damage(QRect(QPoint(0,0),geometry().size()));
     }