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

Change-Id: Iae9a2903afd5da09cfd9288ff6cf74d7f069c83b

2 files changed, 14 insertions, 3 deletions

diff --git a/src/animation/frontend/qclipblendvalue.cpp b/src/animation/frontend/qclipblendvalue.cpp
index c20609050..72a7dd796 100644
--- a/src/animation/frontend/qclipblendvalue.cpp
+++ b/src/animation/frontend/qclipblendvalue.cpp
@@ -59,10 +59,21 @@ QClipBlendValuePrivate::QClipBlendValuePrivate()
    \brief Class used for including a clip in a blend tree.
 */
 /*!
+   \qmltype ClipBlendValue
+   \instantiates QClipBlendValue
+   \inqmlmodule Qt3D.Animation
+   \brief Type used for including a clip in a blend tree.
+*/
+/*!
    \property Qt3DAnimation::QClipBlendValue::clip
 
    The animation clip that needs to be included in the blend tree.
 */
+/*!
+   \qmlproperty AbstractAnimationClip ClipBlendValue::clip
+
+   The animation clip that needs to be included in the blend tree.
+*/
 QClipBlendValue::QClipBlendValue(Qt3DCore::QNode *parent)
     : QAbstractClipBlendNode(*new QClipBlendValuePrivate(), parent)
 {
diff --git a/src/animation/frontend/qlerpclipblend.cpp b/src/animation/frontend/qlerpclipblend.cpp
index fd9dd248c..89ce3ca6f 100644
--- a/src/animation/frontend/qlerpclipblend.cpp
+++ b/src/animation/frontend/qlerpclipblend.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DAnimation {
 
 /*!
-    \qmltype LerpBlend
+    \qmltype LerpClipBlend
     \instantiates Qt3DAnimation::QLerpClipBlend
     \inqmlmodule Qt3D.Animation
 
@@ -52,7 +52,7 @@ namespace Qt3DAnimation {
 
     \since 5.9
 
-    LerpBlend can be useful to create advanced animation effects based on
+    LerpClipBlend can be useful to create advanced animation effects based on
     individual animation clips. For instance, given a player character,, lerp
     blending could be used to combine a walking animation clip with an injured
     animation clip based on a blend factor that increases the more the player
@@ -118,7 +118,7 @@ Qt3DCore::QNodeCreatedChangeBasePtr QLerpClipBlend::createNodeCreationChange() c
 }
 
 /*!
-    \qmlproperty real LerpBlend::blendFactor
+    \qmlproperty real LerpClipBlend::blendFactor
 
     Specifies the blending factor between 0 and 1 to control the blending of
     two animation clips.