diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 16:41:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 16:41:52 (GMT) |
| commit | 0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87 (patch) | |
| tree | 7441b0f5235566477b9875d1a65cc0d7b033a6e3 /src/gui | |
| parent | 72c0128f607d1566ede78dfbba90507086e3fe80 (diff) | |
| parent | d3c1dea37f95ba2bb75a2a264e4d806c4c0c36f3 (diff) | |
| download | Qt-0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87.zip Qt-0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87.tar.gz Qt-0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
CSS: fixes border only affecting the first widget.
fix closing state in QLocalSocket on Windows
Diffstat (limited to 'src/gui')
| -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; } |