diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-20 11:07:05 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-20 15:34:40 +0000 |
| commit | 03ea62d4d7391db7beb6b987b7c965c7b5240d96 (patch) | |
| tree | a4d64f347bb1f9978c9df1a2f4886d68158426b9 /src/client/qwaylandwindow_p.h | |
| parent | 9a99c2196a3220a5ce9e7b6ae617d6f74d2e5079 (diff) | |
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 <liang.qi@qt.io>
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index e67cf0afe..b9ca5ee0e 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) override; + void setWindowState(Qt::WindowState state); // ### Change to WindowStates once qtbase change is in void setWindowFlags(Qt::WindowFlags flags) override; void raise() override; |