diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-09-10 09:59:32 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-09-10 09:59:32 (GMT) |
| commit | eb5430e0091ec257b417fe24ed20b3973151c928 (patch) | |
| tree | a44a772d51f25093ba3c833ff1095186d2b167dd /src | |
| parent | 106d7a210be1e6d52946b575a262e2c76c5e51e6 (diff) | |
| parent | 7691e70a130df66e4597c9fe1ada03496c8c5ba0 (diff) | |
| download | Qt-eb5430e0091ec257b417fe24ed20b3973151c928.zip Qt-eb5430e0091ec257b417fe24ed20b3973151c928.tar.gz Qt-eb5430e0091ec257b417fe24ed20b3973151c928.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
| -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 5a44352..30bccfb 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -1083,11 +1083,11 @@ void QCompleter::setPopup(QAbstractItemView *popup) #else popup->hide(); #endif - popup->setParent(0, Qt::Popup); Qt::FocusPolicy origPolicy = Qt::NoFocus; if (d->widget) origPolicy = d->widget->focusPolicy(); + popup->setParent(0, Qt::Popup); popup->setFocusPolicy(Qt::NoFocus); if (d->widget) d->widget->setFocusPolicy(origPolicy); |