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

Conflicts:
	.qmake.conf

Change-Id: Idf7f59a8c4b78438b496f2c16ba9ce48573042e9

2 files changed, 41 insertions, 6 deletions

diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 0000000..af3c85a
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,36 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+Important Changes
+-----------------
+ - General:
+   * Introduce logging category "qt.svg"
+   * Add file name and line number to SVG parser error messages
+
+ - SVG Image I/O:
+   * [QTBUG-44863] Use defaultSize according to svg standard. If
+     width/height attributes are present, they will be used as default
+     image read size instead of the viewBox width/height.
+
+ - QSvgWidget:
+   * Paint the background if one has been set via a stylesheet
+
+ - QSvgGenerator:
+   * [QTBUG-58148] Add support for pattern brushes
+
+ - QSvgIconEngine:
+   * [QTBUG-59729] Paint correct size if device pixel ratio is fractional
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();