summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjasplin <qt-info@nokia.com>2009-06-16 06:01:33 (GMT)
committerjasplin <qt-info@nokia.com>2009-06-16 06:11:10 (GMT)
commit6e022c5c21a44a25b1579f03498ecaeba6da9024 (patch)
treeb09733115e1046c410fe22ae81dc998e3433cca9 /src
parent3cd7289548c00fe2dcbe790ab4be4f4eca1d4fb3 (diff)
downloadQt-6e022c5c21a44a25b1579f03498ecaeba6da9024.zip
Qt-6e022c5c21a44a25b1579f03498ecaeba6da9024.tar.gz
Qt-6e022c5c21a44a25b1579f03498ecaeba6da9024.tar.bz2
Prevented QCompleter popup from appearing briefly on Windows.
It turns out that the fix 7bf4512659113f8cc78e72f1c84158ce4f70a526 caused the QCompleter popup from appearing for a split second on Windows. This is because the popup is shown as a toplevel window on this platform. On other platforms than Mac and Windows it doesn't seem to matter, but be on the safe side, the fix is modified to apply for Mac only. Reviewed-by: Daniel Molkentin Task-number: 255374
Diffstat (limited to 'src')
-rw-r--r--src/gui/util/qcompleter.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index da3edb0..7f65ee9 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -1077,7 +1077,11 @@ void QCompleter::setPopup(QAbstractItemView *popup)
delete d->popup;
if (popup->model() != d->proxy)
popup->setModel(d->proxy);
- popup->show();
+#ifdef Q_OS_MAC
+ popup->show();
+#else
+ popup->hide();
+#endif
popup->setParent(0, Qt::Popup);
Qt::FocusPolicy origPolicy = Qt::NoFocus;