Wayland: Conform with the api change in the frame callback

4 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index eb9e791..1c56561 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -163,9 +163,9 @@ void QWaylandDisplay::syncCallback(wl_display_sync_func_t func, void *data)
     wl_display_sync_callback(mDisplay, func, data);
 }
 
-void QWaylandDisplay::frameCallback(wl_display_frame_func_t func, void *data)
+void QWaylandDisplay::frameCallback(wl_display_frame_func_t func, struct wl_surface *surface, void *data)
 {
-    wl_display_frame_callback(mDisplay, func, data);
+    wl_display_frame_callback(mDisplay, surface, func, data);
 }
 
 void QWaylandDisplay::flushRequests()
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h
index 3ddbfb2..a2cb1b2 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.h
@@ -77,7 +77,7 @@ public:
     void setCursor(QWaylandBuffer *buffer, int32_t x, int32_t y);
 
     void syncCallback(wl_display_sync_func_t func, void *data);
-    void frameCallback(wl_display_frame_func_t func, void *data);
+    void frameCallback(wl_display_frame_func_t func, struct wl_surface *surface, void *data);
 
     struct wl_display *wl_display() const { return mDisplay; }
 
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 7e94fb9..6f52291 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -125,7 +125,7 @@ void QWaylandWindow::damage(const QRegion &region)
 {
     //We have to do sync stuff before calling damage, or we might
     //get a frame callback before we get the timestamp
-    mDisplay->frameCallback(QWaylandWindow::frameCallback, this);
+    mDisplay->frameCallback(QWaylandWindow::frameCallback, mSurface, this);
     mWaitingForFrameSync = true;
 
     QVector<QRect> rects = region.rects();
@@ -143,7 +143,7 @@ void QWaylandWindow::newSurfaceCreated()
     }
 }
 
-void QWaylandWindow::frameCallback(void *data, uint32_t time)
+void QWaylandWindow::frameCallback(struct wl_surface *surface, void *data, uint32_t time)
 {
     Q_UNUSED(time);
     QWaylandWindow *self = static_cast<QWaylandWindow*>(data);
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow.h
index 35b82bd..1e60508 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow.h
@@ -84,7 +84,7 @@ protected:
     QWaitCondition mFrameSyncWait;
 
 private:
-    static void frameCallback(void *data, uint32_t time);
+    static void frameCallback(struct wl_surface *surface, void *data, uint32_t time);
 
 
 };