Fix isTopLevel() in QWindow.

This also makes modal hints set properly for dialogs so the
additional checks during active window change are not needed
anymore.

Reviewed-by: Samuel Rødal

1 files changed, 1 insertions, 8 deletions

diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index 0210c1474e..ec67452543 100644
--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@@ -157,14 +157,7 @@ void QApplicationPrivate::notifyActiveWindowChange(QWindow *previous)
     Q_Q(QApplication);
     QWindow *wnd = QGuiApplicationPrivate::active_window;
     QWidget *tlw = qt_tlw_for_window(wnd);
-    if (!tlw)
-        return;
-    if (modalState()
-        && !qt_try_modal(tlw, QEvent::MouseButtonRelease)
-        && q->activeWindow())
-        q->activeWindow()->activateWindow();
-    else
-        q->setActiveWindow(tlw);
+    q->setActiveWindow(tlw);
 }
 
 void QApplicationPrivate::closePopup(QWidget *popup)