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

Change-Id: I8b1872f788a714894a73912700bcd07d72db31bc

7 files changed, 21 insertions, 14 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 49570b2..45d16f2 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,4 @@
 load(qt_build_config)
-CONFIG += qt_example_installs
 CONFIG += warning_clean
 
 MODULE_VERSION = 5.7.1
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3
index 4e49b12..71c4ad4 100644
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 6e18461..dfcab5e 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 2.1, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index 4d67bac..6bf924c 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.
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;
diff --git a/tests/auto/qicon_svg/qicon_svg.pro b/tests/auto/qicon_svg/qicon_svg.pro
index ab45a49..5e24892 100644
--- a/tests/auto/qicon_svg/qicon_svg.pro
+++ b/tests/auto/qicon_svg/qicon_svg.pro
@@ -1,12 +1,11 @@
 CONFIG += testcase
 TARGET = tst_qicon_svg
 
-QT += testlib gui-private
+QT += svg testlib gui-private
 SOURCES += tst_qicon_svg.cpp
 RESOURCES = tst_qicon_svg.qrc
 
 wince* {
-   QT += svg
    DEPLOYMENT_PLUGIN += qsvg
 }
 TESTDATA += icons/*