From cb7e0792e1ddaf525db5378a9a62628f1bbdbd33 Mon Sep 17 00:00:00 2001 From: Thomas Senyk Date: Tue, 16 Oct 2012 20:02:15 +0200 Subject: [PATCH] Follow API change for QPlatformWindow::setWindowFlags Change-Id: I442a592d0833a82594e55213a10308243324012c Reviewed-by: Robert Griebl --- src/plugins/platforms/wayland/qwaylandwindow.cpp | 5 ++--- src/plugins/platforms/wayland/qwaylandwindow.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 73fef4c..549e343 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 73a7181..5c80fdc 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; -- 2.7.4