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

Conflicts:
	.qmake.conf
	tests/auto/qicon_svg/qicon_svg.pro

Change-Id: I062ecbb9b092286c3ca7ec5deac3a0767329ba3f

2 files changed, 17 insertions, 8 deletions

diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 96a60da..ae714d7 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -635,10 +635,16 @@ void QSvgStyle::revert(QPainter *p, QSvgExtraStates &states)
 
 QSvgAnimateTransform::QSvgAnimateTransform(int startMs, int endMs, int byMs )
     : QSvgStyleProperty(),
-      m_from(startMs), m_to(endMs),
-      m_type(Empty), m_additive(Replace), m_count(0), m_finished(false), m_transformApplied(false)
+      m_from(startMs),
+      m_totalRunningTime(endMs - startMs),
+      m_type(Empty),
+      m_additive(Replace),
+      m_count(0),
+      m_finished(false),
+      m_freeze(false),
+      m_repeatCount(-1.),
+      m_transformApplied(false)
 {
-    m_totalRunningTime = m_to - m_from;
     Q_UNUSED(byMs);
 }
 
@@ -807,10 +813,13 @@ void QSvgAnimateTransform::setRepeatCount(qreal repeatCount)
 
 QSvgAnimateColor::QSvgAnimateColor(int startMs, int endMs, int byMs)
     : QSvgStyleProperty(),
-      m_from(startMs), m_to(endMs),
-      m_finished(false)
+      m_from(startMs),
+      m_totalRunningTime(endMs - startMs),
+      m_fill(false),
+      m_finished(false),
+      m_freeze(false),
+      m_repeatCount(-1.)
 {
-    m_totalRunningTime = m_to - m_from;
     Q_UNUSED(byMs);
 }
 
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index 43829b4..90fb511 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -686,7 +686,7 @@ public:
 protected:
     void resolveMatrix(const QSvgNode *node);
 private:
-    qreal m_from, m_to;
+    qreal m_from;
     qreal m_totalRunningTime;
     TransformType m_type;
     Additive m_additive;
@@ -712,7 +712,7 @@ public:
     virtual void revert(QPainter *p, QSvgExtraStates &states);
     virtual Type type() const;
 private:
-    qreal m_from, m_to;
+    qreal m_from;
     qreal m_totalRunningTime;
     QList<QColor> m_colors;
     QBrush m_oldBrush;