diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2012-10-18 10:58:58 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@gmail.com> | 2012-10-18 11:31:57 +0200 |
| commit | 3a192e2ef2d27e8b4a0b1b3e8d2f409d34a9e2bf (patch) | |
| tree | b4308def3658657a51f4233cb3591ba624096a30 /src | |
| parent | cb7e0792e1ddaf525db5378a9a62628f1bbdbd33 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandwindow.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandwindow.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 549e3437b..48e3b1b45 100644 --- 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 index 5c80fdcc1..1d35a8c8e 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.h +++ b/src/plugins/platforms/wayland/qwaylandwindow.h @@ -96,7 +96,7 @@ public: 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; |