Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: I44133fbc9b93e96918463b0b0891ee5ab7db9f2c

3 files changed, 24 insertions, 0 deletions

diff --git a/src/animation/frontend/qabstractclipanimator.cpp b/src/animation/frontend/qabstractclipanimator.cpp
index b2f6f817f..cb4621182 100644
--- a/src/animation/frontend/qabstractclipanimator.cpp
+++ b/src/animation/frontend/qabstractclipanimator.cpp
@@ -125,6 +125,11 @@ QAbstractClipAnimator::QAbstractClipAnimator(QAbstractClipAnimatorPrivate &dd, Q
 QAbstractClipAnimator::~QAbstractClipAnimator()
 {
 }
+/*!
+    \qmlproperty bool Qt3DAnimation::AbstractClipAnimator::running
+
+    This property holds a boolean indicating whether the animation is currently running.
+*/
 
 /*!
     \property Qt3DAnimation::QAbstractClipAnimator::running
@@ -142,6 +147,13 @@ bool QAbstractClipAnimator::isRunning() const
 }
 
 /*!
+    \qmlproperty ChannelMapper Qt3DAnimation::AbstractClipAnimator::channelMapper
+
+    This property holds the ChannelMapper that controls how the channels in
+    the animation clip map onto the properties of the target objects.
+*/
+
+/*!
     \property Qt3DAnimation::QAbstractClipAnimator::channelMapper
 
     This property holds the ChannelMapper that controls how the channels in
@@ -199,6 +211,12 @@ int QAbstractClipAnimator::loopCount() const
     return d->m_loops;
 }
 /*!
+    \qmlproperty Clock Qt3DAnimation::AbstractClipAnimator::clock
+
+    The clock controls the speed with which an animation is played.
+*/
+
+/*!
     \property Qt3DAnimation::QAbstractClipAnimator::clock
 
     The clock controls the speed with which an animation is played.
@@ -208,7 +226,11 @@ QClock *QAbstractClipAnimator::clock() const
     Q_D(const QAbstractClipAnimator);
     return d->m_clock;
 }
+/*!
+    \qmlproperty real Qt3DAnimation::AbstractClipAnimator::normalizedTime
 
+    This property holds the clips normalized time.
+*/
 /*!
     \property Qt3DAnimation::QAbstractClipAnimator::normalizedTime
 
diff --git a/src/animation/frontend/qblendedclipanimator.cpp b/src/animation/frontend/qblendedclipanimator.cpp
index 388144c81..c48706606 100644
--- a/src/animation/frontend/qblendedclipanimator.cpp
+++ b/src/animation/frontend/qblendedclipanimator.cpp
@@ -56,6 +56,7 @@ QBlendedClipAnimatorPrivate::QBlendedClipAnimatorPrivate()
     \qmltype BlendedClipAnimator
     \instantiates Qt3DAnimation::QBlendedClipAnimator
     \inqmlmodule Qt3D.Animation
+    \inherits AbstractClipAnimator
     \since 5.9
 
     \brief BlendedClipAnimator is a component providing animation playback capabilities of a tree
diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp
index 398758820..03510aa93 100644
--- a/src/animation/frontend/qclipanimator.cpp
+++ b/src/animation/frontend/qclipanimator.cpp
@@ -66,6 +66,7 @@ bool QClipAnimatorPrivate::canPlay() const
     \qmltype ClipAnimator
     \instantiates Qt3DAnimation::QClipAnimator
     \inqmlmodule Qt3D.Animation
+    \inherits AbstractClipAnimator
     \since 5.9
 
     \brief ClipAnimator is a component providing simple animation playback capabilities.