diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-26 08:04:10 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-26 08:04:10 (GMT) |
| commit | 43381162eac93f0fbe10e06944c59158dccb3d8c (patch) | |
| tree | 6eb3ad70f0074aaf662c83dce56281613c9219bc /src/gui/util | |
| parent | a0548f2fc01a47c1b5de4d967d0bc920bd1867f6 (diff) | |
| parent | d432123cec9ac927ec9162fa8b3d16684483f994 (diff) | |
| download | Qt-43381162eac93f0fbe10e06944c59158dccb3d8c.zip Qt-43381162eac93f0fbe10e06944c59158dccb3d8c.tar.gz Qt-43381162eac93f0fbe10e06944c59158dccb3d8c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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(); |