Follow API change for QPlatformWindow::setWindowFlags

Change-Id: I442a592d0833a82594e55213a10308243324012c Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
sailfishos · Oct 16, 2012 · cb7e079 · cb7e079
1 parent 378d410
commit cb7e079
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -307,11 +307,10 @@ Qt::WindowState QWaylandWindow::setWindowState(Qt::WindowState state)
     return Qt::WindowNoState;
 }
 
-Qt::WindowFlags QWaylandWindow::setWindowFlags(Qt::WindowFlags flags)
+void QWaylandWindow::setWindowFlags(Qt::WindowFlags flags)
 {
     if (mExtendedWindow)
-        return mExtendedWindow->setWindowFlags(flags);
-    return Qt::WindowFlags(0);
+        mExtendedWindow->setWindowFlags(flags);
 }
 
 QWaylandDecoration *QWaylandWindow::decoration() const

diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow.h
@@ -97,7 +97,7 @@ class QWaylandWindow : public QPlatformWindow
     Qt::ScreenOrientation requestWindowOrientation(Qt::ScreenOrientation orientation);
 
     Qt::WindowState setWindowState(Qt::WindowState state);
-    Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags);
+    void setWindowFlags(Qt::WindowFlags flags);
 
     bool isExposed() const;