From 78264f333eb7c262380714ed6517562266f11a03 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Mon, 6 Jun 2011 10:02:06 +0200
Subject: Avoid setting the active window to null when there is a FocusIn
 queued.

---
 src/widgets/kernel/qapplication_qpa.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/widgets/kernel/qapplication_qpa.cpp')

diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index 65aca42cd3..aef8f5ae58 100644
--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@@ -161,6 +161,8 @@ void QApplicationPrivate::notifyActiveWindowChange(QWindow *previous)
     Q_UNUSED(previous);
     Q_Q(QApplication);
     QWindow *wnd = QGuiApplicationPrivate::active_window;
+    if (inPopupMode()) // some delayed focus event to ignore
+        return;
     QWidget *tlw = qt_tlw_for_window(wnd);
     q->setActiveWindow(tlw);
 }
-- 
cgit v1.2.3