summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qcombobox.cpp
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-12-15 13:16:24 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-12-15 13:16:24 (GMT)
commit1c1d3e79e1b7cb2cdffaee38a98bc777e3a7b961 (patch)
tree5c33473950b22db0a0eb9c230005cd8e7f251538 /src/gui/widgets/qcombobox.cpp
parentcace8e6a9f00ee478dfe63a7fa6959056cfe7e8a (diff)
parent0c6780c39d18a4fd06b9bed94400de365a518c45 (diff)
downloadQt-1c1d3e79e1b7cb2cdffaee38a98bc777e3a7b961.zip
Qt-1c1d3e79e1b7cb2cdffaee38a98bc777e3a7b961.tar.gz
Qt-1c1d3e79e1b7cb2cdffaee38a98bc777e3a7b961.tar.bz2
Merge branch '4.7' into mimir
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
-rw-r--r--src/gui/widgets/qcombobox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 7859bdc..5a4e507 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -398,7 +398,7 @@ void QComboBoxPrivateContainer::leaveEvent(QEvent *)
#ifdef Q_WS_MAC
QStyleOptionComboBox opt = comboStyleOption();
if (combo->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, combo))
- view->clearSelection();
+ view->setCurrentIndex(QModelIndex());
#endif
}