Merge integration refs/builds/qtci/dev/1618317407

2 files changed, 13 insertions, 28 deletions

diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 133bc5689d..d5d75e8ab3 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -911,7 +911,7 @@ void QDefaultAnimationDriver::stopTimer()
     m_timer.stop();
 }
 
-
+QAbstractAnimationPrivate::~QAbstractAnimationPrivate() { }
 
 void QAbstractAnimationPrivate::setState(QAbstractAnimation::State newState)
 {
diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h
index e59c770280..9debb64424 100644
--- a/src/corelib/animation/qabstractanimation_p.h
+++ b/src/corelib/animation/qabstractanimation_p.h
@@ -67,43 +67,28 @@ class QAbstractAnimation;
 class QAbstractAnimationPrivate : public QObjectPrivate
 {
 public:
-    QAbstractAnimationPrivate()
-        : state(QAbstractAnimation::Stopped),
-          direction(QAbstractAnimation::Forward),
-          totalCurrentTime(0),
-          currentTime(0),
-          loopCount(1),
-          currentLoop(0),
-          deleteWhenStopped(false),
-          hasRegisteredTimer(false),
-          isPause(false),
-          isGroup(false),
-          group(nullptr)
-    {
-    }
-
-    virtual ~QAbstractAnimationPrivate() {}
+    virtual ~QAbstractAnimationPrivate();
 
     static QAbstractAnimationPrivate *get(QAbstractAnimation *q)
     {
         return q->d_func();
     }
 
-    QAbstractAnimation::State state;
-    QAbstractAnimation::Direction direction;
+    QAbstractAnimation::State state = QAbstractAnimation::Stopped;
+    QAbstractAnimation::Direction direction = QAbstractAnimation::Forward;
     void setState(QAbstractAnimation::State state);
 
-    int totalCurrentTime;
-    int currentTime;
-    int loopCount;
-    int currentLoop;
+    int totalCurrentTime = 0;
+    int currentTime = 0;
+    int loopCount = 1;
+    int currentLoop = 0;
 
-    bool deleteWhenStopped;
-    bool hasRegisteredTimer;
-    bool isPause;
-    bool isGroup;
+    bool deleteWhenStopped = false;
+    bool hasRegisteredTimer = false;
+    bool isPause = false;
+    bool isGroup = false;
 
-    QAnimationGroup *group;
+    QAnimationGroup *group = nullptr;
 
 private:
     Q_DECLARE_PUBLIC(QAbstractAnimation)