From 7691e70a130df66e4597c9fe1ada03496c8c5ba0 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@nokia.com>
Date: Thu, 10 Sep 2009 11:34:39 +0200
Subject: Fix focus policy propagation in QCompleter on QWS

setParent(0) can change the focus policy, so let's retrieve the original
value a bit earlier.

Reviewed-by: jasplin
---
 src/gui/util/qcompleter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index 5a44352..30bccfb 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -1083,11 +1083,11 @@ void QCompleter::setPopup(QAbstractItemView *popup)
 #else
      popup->hide();
 #endif
-    popup->setParent(0, Qt::Popup);
 
     Qt::FocusPolicy origPolicy = Qt::NoFocus;
     if (d->widget)
         origPolicy = d->widget->focusPolicy();
+    popup->setParent(0, Qt::Popup);
     popup->setFocusPolicy(Qt::NoFocus);
     if (d->widget)
         d->widget->setFocusPolicy(origPolicy);
-- 
cgit v0.12