diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 13:33:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 13:33:40 (GMT) |
| commit | 9bf0037c09fb08f84d2a70a072b1356e8a41c25e (patch) | |
| tree | 253cacf85c2b1abd0a3027906c70e0c2c130d874 | |
| parent | 7f272cc96f0ece5fe55ccba1ac4b9ae4c5dbecf6 (diff) | |
| parent | 2e0b5644e17f22ef3fc24ce4c762449149b24af6 (diff) | |
| download | Qt-9bf0037c09fb08f84d2a70a072b1356e8a41c25e.zip Qt-9bf0037c09fb08f84d2a70a072b1356e8a41c25e.tar.gz Qt-9bf0037c09fb08f84d2a70a072b1356e8a41c25e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Mac: p2 combobox regression fix
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index c1ae3f9..4b087e9 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->setCurrentIndex(QModelIndex()); + view->clearSelection(); #endif } @@ -671,8 +671,8 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e) if (vector.manhattanLength() > 9 && blockMouseReleaseTimer.isActive()) blockMouseReleaseTimer.stop(); QModelIndex indexUnderMouse = view->indexAt(m->pos()); - if (indexUnderMouse.isValid() && indexUnderMouse != view->currentIndex() - && !QComboBoxDelegate::isSeparator(indexUnderMouse)) { + if (indexUnderMouse.isValid() + && !QComboBoxDelegate::isSeparator(indexUnderMouse)) { view->setCurrentIndex(indexUnderMouse); } } |