From b9ce9a88c212922483abd6e99a44e7419beeca98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@nokia.com>
Date: Tue, 23 Mar 2010 11:01:30 +0100
Subject: Revert change 7bf4512659 on Cocoa.

This change adds a workarond where we call show() on the
popup in QCompleter::setPopup. Unfortunately this causes
unnecessary startup delays and popup flicker in Creator.

The original bug reports (254456 and 254460) are not
reproducible on Cocoa.
---
 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 387bf87..c095b3b 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -1110,7 +1110,7 @@ void QCompleter::setPopup(QAbstractItemView *popup)
         delete d->popup;
     if (popup->model() != d->proxy)
         popup->setModel(d->proxy);
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
      popup->show();
 #else
      popup->hide();
-- 
cgit v0.12