Follow API change for QPlatformWindow::setWindowState

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>
sailfishos · Oct 18, 2012 · 3a192e2 · 3a192e2
1 parent cb7e079
commit 3a192e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -96,7 +96,7 @@ class QWaylandWindow : public QPlatformWindow
     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;