Adapt to the API change in QPlatformWindow::setWindowState

Change-Id: Ic6655f239ea449baf862934608feda182799c42d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index b9ca5ee0e..7e8db74bc 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -148,7 +148,7 @@ public:
     void handleContentOrientationChange(Qt::ScreenOrientation orientation) override;
     void setOrientationMask(Qt::ScreenOrientations mask);
 
-    void setWindowState(Qt::WindowState state); // ### Change to WindowStates once qtbase change is in
+    void setWindowState(Qt::WindowStates state) override;
     void setWindowFlags(Qt::WindowFlags flags) override;
 
     void raise() override;
@@ -173,8 +173,8 @@ public:
 
     bool createDecoration();
 
-    inline bool isMaximized() const { return mState == Qt::WindowMaximized; }
-    inline bool isFullscreen() const { return mState == Qt::WindowFullScreen; }
+    inline bool isMaximized() const { return mState & Qt::WindowMaximized; }
+    inline bool isFullscreen() const { return mState & Qt::WindowFullScreen; }
 
 #if QT_CONFIG(cursor)
     void setMouseCursor(QWaylandInputDevice *device, const QCursor &cursor);
@@ -238,14 +238,14 @@ protected:
 
     QIcon mWindowIcon;
 
-    Qt::WindowState mState;
+    Qt::WindowStates mState;
     Qt::WindowFlags mFlags;
     QRegion mMask;
 
     QWaylandShmBackingStore *mBackingStore;
 
 private:
-    bool setWindowStateInternal(Qt::WindowState flags);
+    bool setWindowStateInternal(Qt::WindowStates flags);
     void setGeometry_helper(const QRect &rect);
     void initWindow();
     bool shouldCreateShellSurface() const;