diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-03-23 10:01:30 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-03-23 10:52:10 (GMT) |
| commit | b9ce9a88c212922483abd6e99a44e7419beeca98 (patch) | |
| tree | 63b71b8b4fe402b86877b21a96956ff5c3ebd3ce /src/gui/util | |
| parent | fc67ae441fb4bd73041fb7efc96e13310deff5dd (diff) | |
| download | Qt-b9ce9a88c212922483abd6e99a44e7419beeca98.zip Qt-b9ce9a88c212922483abd6e99a44e7419beeca98.tar.gz Qt-b9ce9a88c212922483abd6e99a44e7419beeca98.tar.bz2 | |
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.
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qcompleter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |