diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2017-07-11 14:17:28 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2017-07-11 14:17:28 +0200 |
| commit | 2dd6aa017685bd76f3a315871d07fdaef0e6d5f1 (patch) | |
| tree | 3ee522501db89ab9d295bd169298497c0d86309e /src/animation/frontend/qclipanimator.cpp | |
| parent | 06fa003da1dc6bc16616f3e687de8513d8b40a1c (diff) | |
| parent | cadfd44c77de9ad3d66e936df140e4ba6efb0d74 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I4ceccd338a937a2ada231f568ed02c7a87bd6e80
Diffstat (limited to 'src/animation/frontend/qclipanimator.cpp')
| -rw-r--r-- | src/animation/frontend/qclipanimator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp index da6534d16..3359a70ea 100644 --- a/src/animation/frontend/qclipanimator.cpp +++ b/src/animation/frontend/qclipanimator.cpp @@ -73,7 +73,7 @@ QClipAnimatorPrivate::QClipAnimatorPrivate() The properties for controlling the animator are provided by the AbstractClipAnimator base class. - \sa AbstractClipAnimator, AbstractAnimationClip, ChannelMapper, BlendedClipAnimator + \sa {Qt3DAnimation::QAbstractClipAnimator}{AbstractClipAnimator}, {Qt3DAnimation::QAbstractAnimationClip}{AbstractAnimationClip}, {Qt3DAnimation::QChannelMapper}{ChannelMapper}, {Qt3DAnimation::QBlendedClipAnimator}{BlendedClipAnimator} */ /*! @@ -123,7 +123,7 @@ QClipAnimator::~QClipAnimator() */ /*! - \property clip + \property QClipAnimator::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 a QAnimationClip or QAnimationClipLoader. |