Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	.qmake.conf

Change-Id: Idf7f59a8c4b78438b496f2c16ba9ce48573042e9

1 files changed, 5 insertions, 6 deletions

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();