diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 14:29:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 14:29:30 (GMT) |
| commit | c86b2ef30b43bfbe39d0ebba986d8d33743ae73f (patch) | |
| tree | 04acf7a524d20e4337ea40ad80b1a2612dce24de | |
| parent | 86e7f6cfe0ea46420acb2d589425259eb373f17d (diff) | |
| parent | f9ce9ae008d1e055d5cbbbef6dddd3dd8b226624 (diff) | |
| download | Qt-c86b2ef30b43bfbe39d0ebba986d8d33743ae73f.zip Qt-c86b2ef30b43bfbe39d0ebba986d8d33743ae73f.tar.gz Qt-c86b2ef30b43bfbe39d0ebba986d8d33743ae73f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QComboBoxPrivateScroller draws holes into menu canvas
| -rw-r--r-- | src/gui/widgets/qcombobox_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox_p.h b/src/gui/widgets/qcombobox_p.h index 92d85cc..29a628c 100644 --- a/src/gui/widgets/qcombobox_p.h +++ b/src/gui/widgets/qcombobox_p.h @@ -200,7 +200,9 @@ protected: menuOpt.menuItemType = QStyleOptionMenuItem::Scroller; if (sliderAction == QAbstractSlider::SliderSingleStepAdd) menuOpt.state |= QStyle::State_DownArrow; +#ifndef Q_WS_S60 p.eraseRect(rect()); +#endif style()->drawControl(QStyle::CE_MenuScroller, &menuOpt, &p); } |