summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Senyk <thomas.senyk@pelagicore.com>2012-10-16 20:02:15 +0200
committerRobert Griebl <robert.griebl@pelagicore.com>2012-10-16 20:13:21 +0200
commitcb7e0792e1ddaf525db5378a9a62628f1bbdbd33 (patch)
tree6ea26dbadbb3a901484fed22f8f8d7b43cab2e87 /src
parent378d410d4cad639892048d8867821e04c972e975 (diff)
Follow API change for QPlatformWindow::setWindowFlags
Change-Id: I442a592d0833a82594e55213a10308243324012c Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow.cpp5
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 73fef4c70..549e3437b 100644
--- 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
index 73a71817e..5c80fdcc1 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow.h
@@ -97,7 +97,7 @@ public:
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;