From ab0cd5bbbb956504352f10aa12e5ee829ab0264e Mon Sep 17 00:00:00 2001 From: jasplin Date: Tue, 16 Jun 2009 08:01:33 +0200 Subject: 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 (cherry picked from commit 6e022c5c21a44a25b1579f03498ecaeba6da9024) --- src/gui/util/qcompleter.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index b221e63cf0..3f6e80625d 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; -- cgit v1.2.3