diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-09-14 02:40:47 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-09-14 02:40:47 (GMT) |
| commit | 3dd25afc9802271323407a57ca83b77b485b3234 (patch) | |
| tree | 24aaba58900c07d21f71358ea4b658ea9bca8196 /src/gui/util/qcompleter.cpp | |
| parent | f3e2ccf63de242feeba10e75fd00ffd43fc038b0 (diff) | |
| parent | c151b747e0d7b45e0c7d5de6964b9dfef207d833 (diff) | |
| download | Qt-3dd25afc9802271323407a57ca83b77b485b3234.zip Qt-3dd25afc9802271323407a57ca83b77b485b3234.tar.gz Qt-3dd25afc9802271323407a57ca83b77b485b3234.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
examples/multimedia/audio/audiodevices/audiodevicesbase.ui
Diffstat (limited to 'src/gui/util/qcompleter.cpp')
| -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); |