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

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index e53a205..1b65c4e 100644 (file)
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -154,7 +154,7 @@ void QWindow::setParent(QWindow *parent)
 bool QWindow::isTopLevel() const
 {
     Q_D(const QWindow);
-    return d->parentWindow != 0;
+    return d->parentWindow == 0;
 }
 
 bool QWindow::isModal() const

diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index 0210c14..ec67452 100644 (file)
--- 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)