diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 18:57:26 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 18:57:26 +1000 |
| commit | d1502cb8e3ed43823d63f6e39e24b0a83625291e (patch) | |
| tree | 90d6457d3df8fb77adaa810f2a8c7ada664acebf /src/gui/widgets | |
| parent | 00cd44c1976fb25f419e487bd6e626c5d2520727 (diff) | |
| parent | d9004ddf237a09f3b7f25128ceb83a0e79e7b1aa (diff) | |
| download | qt4-tools-d1502cb8e3ed43823d63f6e39e24b0a83625291e.tar.gz | |
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:
Cocoa: popup hides behind window
Cocoa: combobox does not hightlight when mouse re-hovers the first item
Cocoa: Fix addChildWindow bug where we connect a grandparent to a child
Cocoa: cannot use staysOnTop flag for native file dialogs
Cocoa: make sure stays on top child windows are not levelled down
Cocoa: native child filedialogs sometimes shows non-native on screen
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 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 } |