summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@qt.io>2017-08-02 16:14:08 +0200
committerNico Vertriest <nico.vertriest@qt.io>2017-08-11 10:10:02 +0000
commitaa4381e74c9c5db200c6920dd774c97cbffb493b (patch)
treeb4e2c8526d38dad4979501f64c593b1d737443d1
parent2a1849d414fd38fec389d3512f9120d75287444e (diff)
Doc: correct declaration qml properties
qadditiveclipblend.cpp:173: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode baseClip qadditiveclipblend.cpp:191: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode additiveClip qblendedclipanimator.cpp:276: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode blendTree qclipanimator.cpp:124: warning: Unrecognizable QML module/component qualifier for AbstractAnimationClip clip Change-Id: Ic761f75986e41dc4ec7ab9e97e6776e49498f870 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
-rw-r--r--src/animation/frontend/qadditiveclipblend.cpp4
-rw-r--r--src/animation/frontend/qblendedclipanimator.cpp7
-rw-r--r--src/animation/frontend/qclipanimator.cpp3
3 files changed, 6 insertions, 8 deletions
diff --git a/src/animation/frontend/qadditiveclipblend.cpp b/src/animation/frontend/qadditiveclipblend.cpp
index 5cbd75af6..dda3265c2 100644
--- a/src/animation/frontend/qadditiveclipblend.cpp
+++ b/src/animation/frontend/qadditiveclipblend.cpp
@@ -165,7 +165,7 @@ float QAdditiveClipBlend::additiveFactor() const
}
/*!
- \qmlproperty AbstractClipBlendNode baseClip
+ \qmlproperty AbstractClipBlendNode Qt3D.Animation::AdditiveClipBlend::baseClip
This property holds the base animation clip. When the additiveFactor is zero the \a baseClip will
also be the resulting clip of this blend node.
@@ -183,7 +183,7 @@ QAbstractClipBlendNode *QAdditiveClipBlend::baseClip() const
}
/*!
- \qmlproperty AbstractClipBlendNode additiveClip
+ \qmlproperty AbstractClipBlendNode Qt3D.Animation::AdditiveClipBlend::additiveClip
This property holds the additive clip to be blended with the baseClip. The amount of blending
is controlled by the additiveFactor property.
diff --git a/src/animation/frontend/qblendedclipanimator.cpp b/src/animation/frontend/qblendedclipanimator.cpp
index 90d82a69f..93cc27f50 100644
--- a/src/animation/frontend/qblendedclipanimator.cpp
+++ b/src/animation/frontend/qblendedclipanimator.cpp
@@ -267,12 +267,11 @@ QBlendedClipAnimator::~QBlendedClipAnimator()
}
/*!
- \qmlproperty AbstractClipBlendNode blendTree
+ \qmlproperty AbstractClipBlendNode Qt3D.Animation::BlendedClipAnimator::blendTree
- This property holds the root of the animation blend tree that will be evaluated before being
- interpolated by the animator.
+ This property holds the root of the animation blend tree that will
+ be evaluated before being interpolated by the animator.
*/
-
/*!
\property QBlendedClipAnimator::blendTree
diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp
index cf56c0977..750da352d 100644
--- a/src/animation/frontend/qclipanimator.cpp
+++ b/src/animation/frontend/qclipanimator.cpp
@@ -115,12 +115,11 @@ QClipAnimator::~QClipAnimator()
}
/*!
- \qmlproperty AbstractAnimationClip clip
+ \qmlproperty var Qt3D.Animation::ClipAnimator::clip
This property holds the animation clip which contains the key frame data to be played back.
The key frame data can be specified in either an AnimationClip or AnimationClipLoader.
*/
-
/*!
\property QClipAnimator::clip