diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-06 10:02:06 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-06 10:15:14 +0200 |
| commit | 78264f333eb7c262380714ed6517562266f11a03 (patch) | |
| tree | 8d7c12effd91d0c8987c26303f9ef501b843b5a0 /src/widgets/kernel/qapplication_qpa.cpp | |
| parent | 4f1a6ac732f7f879b082b6d413ca4918c6b06dc3 (diff) | |
Avoid setting the active window to null when there is a FocusIn queued.
Diffstat (limited to 'src/widgets/kernel/qapplication_qpa.cpp')
| -rw-r--r-- | src/widgets/kernel/qapplication_qpa.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); } |