diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-02-17 15:22:47 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-02-19 23:36:29 +0000 |
| commit | 5f80a7956e1b884c7ce7f5102185a052c84d2056 (patch) | |
| tree | 76bd8cd6775c348d42fe7918f9c41dbb38ad2162 /tests/manual/windowflags/controllerwindow.cpp | |
| parent | 9965e92e4f3d99e0cd4a6f74b21552b1d89fae97 (diff) | |
windowflags: Improve compound states handling
Change-Id: Iab5df40b69cf9c0e11f0e495a6b27af9c05fbd94
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'tests/manual/windowflags/controllerwindow.cpp')
| -rw-r--r-- | tests/manual/windowflags/controllerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp index 3654bfbad0..9a12c8b2c9 100644 --- a/tests/manual/windowflags/controllerwindow.cpp +++ b/tests/manual/windowflags/controllerwindow.cpp @@ -191,12 +191,12 @@ static bool isTopLevel(const QObject *o) return false; } -static Qt::WindowState windowState(const QObject *o) +static Qt::WindowStates windowState(const QObject *o) { if (o->isWidgetType()) { Qt::WindowStates states = static_cast<const QWidget *>(o)->windowState(); states &= ~Qt::WindowActive; - return static_cast<Qt::WindowState>(int(states)); + return states; } #if QT_VERSION >= 0x050000 if (o->isWindowType()) |