diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-19 08:49:03 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-19 08:49:03 (GMT) |
| commit | c6f8b600cb1635bef425b3d2232213fb41ea96bd (patch) | |
| tree | 77f384a62f76de02d9765d615966327b91e4bb4a /src/svg | |
| parent | 6cc1e0106845a0dfe9433c4413b3c064c73ccfe2 (diff) | |
| parent | 9f9ede616079998f8ba7bf6fd446f39ce74b0400 (diff) | |
| download | Qt-c6f8b600cb1635bef425b3d2232213fb41ea96bd.zip Qt-c6f8b600cb1635bef425b3d2232213fb41ea96bd.tar.gz Qt-c6f8b600cb1635bef425b3d2232213fb41ea96bd.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/qsvghandler.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index cb07c53..c5026b8 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1673,10 +1673,19 @@ static void parseCSStoXMLAttrs(const QVector<QCss::Declaration> &declarations, const QCss::Declaration &decl = declarations.at(i); if (decl.d->property.isEmpty()) continue; - if (decl.d->values.count() != 1) - continue; QCss::Value val = decl.d->values.first(); - QString valueStr = val.toString(); + QString valueStr; + if (decl.d->values.count() != 1) { + for (int i=0; i<decl.d->values.count(); ++i) { + const QString &value = decl.d->values[i].toString(); + if (value.isEmpty()) + valueStr += QLatin1Char(','); + else + valueStr += value; + } + } else { + valueStr = val.toString(); + } if (val.type == QCss::Value::Uri) { valueStr.prepend(QLatin1String("url(")); valueStr.append(QLatin1Char(')')); |