summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-12-15 00:00:19 +0100
committerA-Team <ateam@pad.test.qt.nokia.com>2010-12-15 00:00:19 +0100
commit0c6780c39d18a4fd06b9bed94400de365a518c45 (patch)
tree9a943de808db4f092e910cb086782bf19fd352fd /src/gui/widgets
parent4b1664447940a4674d0551f626561a30cfa3ce8f (diff)
parent1d0ddf8037c068ff584dda60cffeb6b2b506d4b2 (diff)
downloadqt4-tools-0c6780c39d18a4fd06b9bed94400de365a518c45.tar.gz
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/widgets')
-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 7859bdce8d..5a4e507b83 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
}