1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare for qtbase change

Browse Source 
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>
This commit is contained in:
Paul Olav Tvete 2017-03-20 11:07:05 +01:00
parent 697e074e2c
commit a74c82edb4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -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;