diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-14 06:36:55 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-14 06:36:55 (GMT) |
| commit | a683587a5ffd07366d60f1c4eb56aaee090fcbc4 (patch) | |
| tree | 2403a648b9b0a4bd68823cdfa38a9d69e2252100 /src/gui/text | |
| parent | 90de3e5c903b67b2e5f3d7dc14266fe24f1daa23 (diff) | |
| parent | e2b31c909912c24bd87a4454dca8ae766e9aca52 (diff) | |
| download | Qt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.zip Qt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.tar.gz Qt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.tar.bz2 | |
Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squash
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qcssparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 938decd..b3d2526 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -895,7 +895,7 @@ void ValueExtractor::borderValue(const Declaration &decl, int *width, QCss::Bord BorderData data = qvariant_cast<BorderData>(decl.d->parsed); *width = lengthValueFromData(data.width, f); *style = data.style; - *color = brushFromData(data.color, pal); + *color = data.color.type != BrushData::Invalid ? brushFromData(data.color, pal) : QBrush(QColor()); return; } |