fix fullscreen state in QWidgetWindow::handleWindowStateChangedEvent

A widget can be Qt::WindowMaximized and Qt::WindowFullScreen at the same
time. See tst_qwidget::windowState.

Task-number: QTBUG-26420
Change-Id: I89d6edb857f41cda911152244cf23d36dfd1cdce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index 1b076d1..10de176 100644 (file)
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -526,14 +526,12 @@ void QWidgetWindow::handleWindowStateChangedEvent(QWindowStateChangeEvent *event
         if (effectiveState(widgetState) == Qt::WindowNoState)
             if (QTLWExtra *tle = m_widget->d_func()->maybeTopData())
                 tle->normalGeometry = m_widget->geometry();
-        widgetState &= ~Qt::WindowFullScreen;
         widgetState |= Qt::WindowMaximized;
         break;
     case Qt::WindowFullScreen:
         if (effectiveState(widgetState) == Qt::WindowNoState)
             if (QTLWExtra *tle = m_widget->d_func()->maybeTopData())
                 tle->normalGeometry = m_widget->geometry();
-        widgetState &= ~Qt::WindowMaximized;
         widgetState |= Qt::WindowFullScreen;
         break;
     case Qt::WindowActive: // Not handled by QWindow