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/qadditiveclipblend.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/qadditiveclipblend.cpp')
| -rw-r--r-- | src/animation/frontend/qadditiveclipblend.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/animation/frontend/qadditiveclipblend.cpp b/src/animation/frontend/qadditiveclipblend.cpp index 58ef5e577..5cbd75af6 100644 --- a/src/animation/frontend/qadditiveclipblend.cpp +++ b/src/animation/frontend/qadditiveclipblend.cpp @@ -167,14 +167,14 @@ float QAdditiveClipBlend::additiveFactor() const /*! \qmlproperty AbstractClipBlendNode baseClip - This property holds the base animation clip. When the additiveFacgtor is zero the baseClip will + 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. */ /*! - \property baseClip + \property QAdditiveClipBlend::baseClip - This property holds the base animation clip. When the additiveFacgtor is zero the baseClip will - also be the resulting clip of this blend node. + This property holds the base animation clip. When the additiveFactor + is zero the baseClip will also be the resulting clip of this blend node. */ QAbstractClipBlendNode *QAdditiveClipBlend::baseClip() const { @@ -189,7 +189,7 @@ QAbstractClipBlendNode *QAdditiveClipBlend::baseClip() const is controlled by the additiveFactor property. */ /*! - \property additiveClip + \property QAdditiveClipBlend::additiveClip This property holds the additive clip to be blended with the baseClip. The amount of blending is controlled by the additiveFactor property. |