Follow API change for QPlatformWindow::setWindowState
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>
Thu, 18 Oct 2012 08:58:58 +0000 (10:58 +0200)
committerJørgen Lind <jorgen.lind@gmail.com>
Thu, 18 Oct 2012 09:31:57 +0000 (11:31 +0200)
Follow change introduced in d6588d2

Change-Id: I1040e973612edced105163c2af06d165a0c27d51
Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com>
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/wayland/qwaylandwindow.h

index 549e343..48e3b1b 100644 (file)
@@ -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)
index 5c80fdc..1d35a8c 100644 (file)
@@ -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;