From a74c82edb4b64e265eb1eb1e90de4473686c0510 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Mon, 20 Mar 2017 11:07:05 +0100 Subject: [PATCH] Prepare for qtbase change The signature of setWindowState is changing. Remove the 'override' so qtwayland compiles without error against both the new and the old version. Task-number: QTBUG-59588 Change-Id: I2adc6a5a1addc9b8855a3a1b3c1f0e3952181846 Reviewed-by: Liang Qi --- src/plugins/platforms/wayland/qwaylandwindow_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/wayland/qwaylandwindow_p.h b/src/plugins/platforms/wayland/qwaylandwindow_p.h index e67cf0afe9d..b9ca5ee0e3a 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow_p.h +++ b/src/plugins/platforms/wayland/qwaylandwindow_p.h @@ -148,7 +148,7 @@ public: void handleContentOrientationChange(Qt::ScreenOrientation orientation) override; void setOrientationMask(Qt::ScreenOrientations mask); - void setWindowState(Qt::WindowState state) override; + void setWindowState(Qt::WindowState state); // ### Change to WindowStates once qtbase change is in void setWindowFlags(Qt::WindowFlags flags) override; void raise() override;