1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h
index 5be59543c8..cbe3f6339e 100644
--- a/src/corelib/animation/qabstractanimation_p.h
+++ b/src/corelib/animation/qabstractanimation_p.h
@@ -17,7 +17,6 @@
 
 #include <QtCore/qbasictimer.h>
 #include <QtCore/qdatetime.h>
-#include <QtCore/qtimer.h>
 #include <QtCore/qelapsedtimer.h>
 #include <private/qobject_p.h>
 #include <private/qproperty_p.h>
@@ -29,7 +28,7 @@ QT_BEGIN_NAMESPACE
 
 class QAnimationGroup;
 class QAbstractAnimation;
-class QAbstractAnimationPrivate : public QObjectPrivate
+class Q_CORE_EXPORT QAbstractAnimationPrivate : public QObjectPrivate
 {
 public:
     QAbstractAnimationPrivate();
@@ -48,7 +47,7 @@ public:
     {
         q_func()->setDirection(direction);
     }
-    void emitDirectionChanged() { emit q_func()->directionChanged(direction); }
+    void emitDirectionChanged() { Q_EMIT q_func()->directionChanged(direction); }
     Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS(QAbstractAnimationPrivate, QAbstractAnimation::Direction,
                                        direction, &QAbstractAnimationPrivate::setDirection,
                                        &QAbstractAnimationPrivate::emitDirectionChanged,
@@ -61,7 +60,7 @@ public:
 
     Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(QAbstractAnimationPrivate, int, loopCount, 1)
 
-    void emitCurrentLoopChanged() { emit q_func()->currentLoopChanged(currentLoop); }
+    void emitCurrentLoopChanged() { Q_EMIT q_func()->currentLoopChanged(currentLoop); }
     Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS(QAbstractAnimationPrivate, int, currentLoop, nullptr,
                                        &QAbstractAnimationPrivate::emitCurrentLoopChanged, 0)
 
@@ -116,7 +115,8 @@ public:
 
     virtual void updateAnimationsTime(qint64 delta) = 0;
     virtual void restartAnimationTimer() = 0;
-    virtual int runningAnimationCount() = 0;
+#define QT_QAbstractAnimationTimer_runningAnimationCount_IS_CONST
+    virtual qsizetype runningAnimationCount() const = 0;
 
     bool isRegistered = false;
     bool isPaused = false;
@@ -163,7 +163,7 @@ public:
     void updateAnimationTimers();
 
     //useful for profiling/debugging
-    int runningAnimationCount();
+    qsizetype runningAnimationCount() const;
     void registerProfilerCallback(void (*cb)(qint64));
 
     void startAnimationDriver();
@@ -247,7 +247,7 @@ public:
     void updateAnimationsTime(qint64 delta) override;
 
     //useful for profiling/debugging
-    int runningAnimationCount() override { return animations.size(); }
+    qsizetype runningAnimationCount() const override { return animations.size(); }
 
 private Q_SLOTS:
     void startAnimations();