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

 Conflicts:
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4internalclass.cpp
	src/qml/parser/qqmljslexer.cpp
	src/qml/qml/v8/qv8engine.cpp
	src/qml/util/qqmladaptormodel_p.h
	src/quick/items/qquickanimatedsprite.cpp
	tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp

Change-Id: I16702b7a0da29c2a332afee47728d6a6ebf4fb3f

1 files changed, 6 insertions, 6 deletions

diff --git a/src/qml/animations/qsequentialanimationgroupjob_p.h b/src/qml/animations/qsequentialanimationgroupjob_p.h
index 760445c8c6..13f9806be1 100644
--- a/src/qml/animations/qsequentialanimationgroupjob_p.h
+++ b/src/qml/animations/qsequentialanimationgroupjob_p.h
@@ -79,12 +79,12 @@ protected:
 private:
     struct AnimationIndex
     {
-        AnimationIndex() : afterCurrent(false), timeOffset(0), animation(0) {}
+        AnimationIndex() {}
         // AnimationIndex points to the animation at timeOffset, skipping 0 duration animations.
         // Note that the index semantic is slightly different depending on the direction.
-        bool afterCurrent;  //whether animation is before or after m_currentAnimation   //TODO: make enum Before/After/Same
-        int timeOffset; // time offset when the animation at index starts.
-        QAbstractAnimationJob *animation; //points to the animation at timeOffset
+        bool afterCurrent = false;  //whether animation is before or after m_currentAnimation   //TODO: make enum Before/After/Same
+        int timeOffset = 0; // time offset when the animation at index starts.
+        QAbstractAnimationJob *animation = nullptr; //points to the animation at timeOffset
     };
 
     int animationActualTotalDuration(QAbstractAnimationJob *anim) const;
@@ -105,8 +105,8 @@ private:
     void advanceForwards(const AnimationIndex &newAnimationIndex);
 
     //state
-    QAbstractAnimationJob *m_currentAnimation;
-    int m_previousLoop;
+    QAbstractAnimationJob *m_currentAnimation = nullptr;
+    int m_previousLoop = 0;
 };
 
 QT_END_NAMESPACE