diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 10:34:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 10:34:50 (GMT) |
| commit | 6755d6a5f09872a183ef688962e303038ec51940 (patch) | |
| tree | 19422e4eed66fbe5278a12a3eaacd21f61ac9273 | |
| parent | 46ba213883cf46871ef539ef4d2304064b671175 (diff) | |
| parent | c6e447fefb99c569d22e7c34181d30ce62ffe2bf (diff) | |
| download | Qt-6755d6a5f09872a183ef688962e303038ec51940.zip Qt-6755d6a5f09872a183ef688962e303038ec51940.tar.gz Qt-6755d6a5f09872a183ef688962e303038ec51940.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fixes color property of QComboBox stylesheet
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 1b13d8c..4b591e2 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -3701,7 +3701,9 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q editRect.translate(cb->iconSize.width() + spacing, 0); } if (!cb->currentText.isEmpty() && !cb->editable) { - drawItemText(p, editRect.adjusted(0, 0, 0, 0), Qt::AlignLeft | Qt::AlignVCenter, cb->palette, + QPalette styledPalette(cb->palette); + rule.configurePalette(&styledPalette, QPalette::Text, QPalette::Base); + drawItemText(p, editRect.adjusted(0, 0, 0, 0), Qt::AlignLeft | Qt::AlignVCenter, styledPalette, cb->state & State_Enabled, cb->currentText, QPalette::Text); } p->restore(); |