diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-14 23:00:19 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-14 23:00:19 (GMT) |
| commit | 0c6780c39d18a4fd06b9bed94400de365a518c45 (patch) | |
| tree | 9a943de808db4f092e910cb086782bf19fd352fd /src/gui/widgets | |
| parent | 4b1664447940a4674d0551f626561a30cfa3ce8f (diff) | |
| parent | 1d0ddf8037c068ff584dda60cffeb6b2b506d4b2 (diff) | |
| download | Qt-0c6780c39d18a4fd06b9bed94400de365a518c45.zip Qt-0c6780c39d18a4fd06b9bed94400de365a518c45.tar.gz Qt-0c6780c39d18a4fd06b9bed94400de365a518c45.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 2 |
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 } |