From a02d1ac962da03436c4d5062d50fc95ca1284008 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 7 Sep 2012 09:36:49 +0200
Subject: Do not call requestActivateWindow() on popups.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Showing a compo dropdown would cause the parent to
become deactivated (Windows). Introduced by:

8368557b9c0010fb205969d010c9d8549fbee0ae for
QTBUG-25852 , QTBUG-23699 .

Task-number: QTBUG-27145
Change-Id: I7b89697a2c55d58cc0ab184b61a0cff8bf2275ec
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
---
 src/widgets/kernel/qwidget_qpa.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index a1a414e4f4..a94ecebc64 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -684,10 +684,13 @@ void QWidgetPrivate::setFocus_sys()
 {
     Q_Q(QWidget);
     // Embedded native widget may have taken the focus; get it back to toplevel if that is the case
-    if (QWindow *nativeWindow = q->window()->windowHandle()) {
-        if (nativeWindow != QGuiApplication::focusWindow()
-            && q->testAttribute(Qt::WA_WState_Created)) {
-            nativeWindow->requestActivateWindow();
+    const QWidget *topLevel = q->window();
+    if (topLevel->windowType() != Qt::Popup) {
+        if (QWindow *nativeWindow = q->window()->windowHandle()) {
+            if (nativeWindow != QGuiApplication::focusWindow()
+                && q->testAttribute(Qt::WA_WState_Created)) {
+                nativeWindow->requestActivateWindow();
+            }
         }
     }
 }
-- 
cgit v1.2.3