diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-05-05 11:09:45 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-05-05 11:09:45 (GMT) |
| commit | 1b129f922dae09865d18422ca6be10d6e1587315 (patch) | |
| tree | aff2a9e06503ed429fcec1acc65b9b0988d17541 /src/gui | |
| parent | 3fb8a253c0f7823c07dc2f716c12540ff421cabb (diff) | |
| parent | 5811971e1b5c078677349c8276c170c7906c72de (diff) | |
| download | Qt-1b129f922dae09865d18422ca6be10d6e1587315.zip Qt-1b129f922dae09865d18422ca6be10d6e1587315.tar.gz Qt-1b129f922dae09865d18422ca6be10d6e1587315.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 12b1c4a..664bb46 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -143,7 +143,10 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt menuOption.icon = qvariant_cast<QPixmap>(variant); break; } - + if (qVariantCanConvert<QBrush>(index.data(Qt::BackgroundRole))) { + menuOption.palette.setBrush(QPalette::All, QPalette::Background, + qvariant_cast<QBrush>(index.data(Qt::BackgroundRole))); + } menuOption.text = index.model()->data(index, Qt::DisplayRole).toString() .replace(QLatin1Char('&'), QLatin1String("&&")); menuOption.tabWidth = 0; |