From 3a192e2ef2d27e8b4a0b1b3e8d2f409d34a9e2bf Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 18 Oct 2012 10:58:58 +0200 Subject: [PATCH] Follow API change for QPlatformWindow::setWindowState MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Follow change introduced in d6588d2 Change-Id: I1040e973612edced105163c2af06d165a0c27d51 Reviewed-by: Thomas Senyk Reviewed-by: Jørgen Lind --- src/plugins/platforms/wayland/qwaylandwindow.cpp | 6 +----- src/plugins/platforms/wayland/qwaylandwindow.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 549e343..48e3b1b 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -291,7 +291,7 @@ Qt::ScreenOrientation QWaylandWindow::requestWindowOrientation(Qt::ScreenOrienta return Qt::PrimaryOrientation; } -Qt::WindowState QWaylandWindow::setWindowState(Qt::WindowState state) +void QWaylandWindow::setWindowState(Qt::WindowState state) { if (state == Qt::WindowFullScreen || state == Qt::WindowMaximized) { QScreen *screen = window()->screen(); @@ -300,11 +300,7 @@ Qt::WindowState QWaylandWindow::setWindowState(Qt::WindowState state) setGeometry(geometry); QWindowSystemInterface::handleGeometryChange(window(), geometry); - - return state; } - - return Qt::WindowNoState; } void QWaylandWindow::setWindowFlags(Qt::WindowFlags flags) diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow.h index 5c80fdc..1d35a8c 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.h +++ b/src/plugins/platforms/wayland/qwaylandwindow.h @@ -96,7 +96,7 @@ public: void handleContentOrientationChange(Qt::ScreenOrientation orientation); Qt::ScreenOrientation requestWindowOrientation(Qt::ScreenOrientation orientation); - Qt::WindowState setWindowState(Qt::WindowState state); + void setWindowState(Qt::WindowState state); void setWindowFlags(Qt::WindowFlags flags); bool isExposed() const; -- 2.7.4