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

Change-Id: I2d373d538df3a65ac2d41238e5c6a214a151be68

2 files changed, 7 insertions, 0 deletions

diff --git a/src/animation/frontend/qanimationclip.cpp b/src/animation/frontend/qanimationclip.cpp
index 7e7250021..2b04ce1ea 100644
--- a/src/animation/frontend/qanimationclip.cpp
+++ b/src/animation/frontend/qanimationclip.cpp
@@ -70,12 +70,18 @@ QAnimationClip::~QAnimationClip()
 {
 }
 
+/*!
+    Returns the data describing the animation clip.
+*/
 QAnimationClipData QAnimationClip::clipData() const
 {
     Q_D(const QAnimationClip);
     return d->m_clipData;
 }
 
+/*!
+    Set the parameters of the clip according to the \a clipData provided.
+*/
 void QAnimationClip::setClipData(const Qt3DAnimation::QAnimationClipData &clipData)
 {
     Q_D(QAnimationClip);
diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp
index 19e6eafed..79125a76e 100644
--- a/src/animation/frontend/qclipanimator.cpp
+++ b/src/animation/frontend/qclipanimator.cpp
@@ -175,6 +175,7 @@ void QClipAnimator::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
         if (callbackTrigger->callback())
             callbackTrigger->callback()->valueChanged(callbackTrigger->value());
     }
+    QAbstractClipAnimator::sceneChangeEvent(change);
 }
 
 } // namespace Qt3DAnimation