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

windowflags: Improve compound states handling

Browse Source 
Change-Id: Iab5df40b69cf9c0e11f0e495a6b27af9c05fbd94
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Tor Arne Vestbø 2017-02-17 15:22:47 +01:00
parent 9965e92e4f
commit 5f80a7956e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/manual/windowflags/controllerwindow.cpp
View File

@ -191,12 +191,12 @@ static bool isTopLevel(const QObject *o)
return false; return false;
} }
static Qt::WindowState windowState(const QObject *o) static Qt::WindowStates windowState(const QObject *o)
{ {
if (o->isWidgetType()) { if (o->isWidgetType()) {
Qt::WindowStates states = static_cast<const QWidget *>(o)->windowState(); Qt::WindowStates states = static_cast<const QWidget *>(o)->windowState();
states &= ~Qt::WindowActive; states &= ~Qt::WindowActive;
return static_cast<Qt::WindowState>(int(states)); return states;
} }
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
if (o->isWindowType()) if (o->isWindowType())