diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
commit | 1077edd108129a628195708c787c3922d2270c37 (patch) | |
tree | 1346bb4e46562b6d6fba22c7e81efa30470044bb /src/plugins/platforms/wayland/qwaylandwindow.cpp | |
parent | 0e3823d30c2294eb11c205ca11fca55508478151 (diff) | |
parent | c41153e69336701488385d9194d72e72164b28b8 (diff) |
Merge remote branch 'origin/master' into refactor
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandwindow.cpp')
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 35abeafd63..b30cd4ab16 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -146,6 +146,7 @@ void QWaylandWindow::newSurfaceCreated() void QWaylandWindow::frameCallback(struct wl_surface *surface, void *data, uint32_t time) { Q_UNUSED(time); + Q_UNUSED(surface); QWaylandWindow *self = static_cast<QWaylandWindow*>(data); self->mWaitingForFrameSync = false; } |