diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/svg/qsvghandler.cpp | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index d94a2e0..597b0c5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.9.0 +MODULE_VERSION = 5.9.1 diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index c40091f..c4e2b03 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1912,13 +1912,12 @@ static void parseCSStoXMLAttrs(const QVector<QCss::Declaration> &declarations, continue; QCss::Value val = decl.d->values.first(); 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()) + const int valCount = decl.d->values.count(); + if (valCount != 1) { + for (int i = 0; i < valCount; ++i) { + valueStr += decl.d->values[i].toString(); + if (i + 1 < valCount) valueStr += QLatin1Char(','); - else - valueStr += value; } } else { valueStr = val.toString(); |