diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-10-22 17:30:27 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-25 17:55:32 (GMT) |
| commit | 229d9d36c3ba3f4149d050a6942886b181a90db7 (patch) | |
| tree | d386352888a308b0780340979ad77fa846ac496d /src/plugins/platforms | |
| parent | f9d0a75c066ecc464907c2021874d9e2c347d9a4 (diff) | |
| download | Qt-229d9d36c3ba3f4149d050a6942886b181a90db7.zip Qt-229d9d36c3ba3f4149d050a6942886b181a90db7.tar.gz Qt-229d9d36c3ba3f4149d050a6942886b181a90db7.tar.bz2 | |
Wayland: misc cleanups
Unused variables, debug output.
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandwindowsurface.cpp | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 30e0f6a..248158d 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -252,6 +252,10 @@ void QWaylandDisplay::shellHandleConfigure(void *data, struct wl_shell *shell, int32_t x, int32_t y, int32_t width, int32_t height) { + Q_UNUSED(data); + Q_UNUSED(shell); + Q_UNUSED(time); + Q_UNUSED(edges); QWaylandWindow *ww = (QWaylandWindow *) wl_surface_get_user_data(surface); ww->configure(time, edges, x, y, width, height); @@ -380,9 +384,9 @@ QWaylandDisplay::QWaylandDisplay(void) * initialize EGL before proceeding */ forceRoundtrip(mDisplay); if (mEglDisplay == NULL) - qWarning("EGL not available"); + qDebug("EGL not available"); else - qWarning("EGL initialized"); + qDebug("EGL initialized"); int fd = wl_display_get_fd(mDisplay, sourceUpdate, this); mReadNotifier = new QSocketNotifier(fd, QSocketNotifier::Read, this); @@ -465,6 +469,8 @@ void QWaylandWindow::configure(uint32_t time, uint32_t edges, int32_t x, int32_t y, int32_t width, int32_t height) { + Q_UNUSED(time); + Q_UNUSED(edges); QRect geometry = QRect(x, y, width, height); QWindowSystemInterface::handleGeometryChange(widget(), geometry); @@ -546,6 +552,8 @@ QPlatformWindow *QWaylandIntegration::createPlatformWindow(QWidget *widget, WId QWindowSurface *QWaylandIntegration::createWindowSurface(QWidget *widget, WId winId) const { Q_UNUSED(winId); + Q_UNUSED(winId); + return new QWaylandShmWindowSurface(widget, mDisplay); } diff --git a/src/plugins/platforms/wayland/qwaylandwindowsurface.cpp b/src/plugins/platforms/wayland/qwaylandwindowsurface.cpp index 0fd519e..0954bc5 100644 --- a/src/plugins/platforms/wayland/qwaylandwindowsurface.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindowsurface.cpp @@ -177,6 +177,8 @@ QWaylandDrmBuffer::QWaylandDrmBuffer(QWaylandDisplay *display, const QSize &size, QImage::Format format) : mDisplay(display) { + Q_UNUSED(format); + EGLint name, stride; EGLint imageAttribs[] = { EGL_WIDTH, 0, |