diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-08-19 15:53:30 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-08-19 16:28:52 +0100 |
| commit | 8f863343a9e2e2f3630f22407f4e5e30e72745cf (patch) | |
| tree | 5574e3c2215d74345e15df5f45ed3211e065541a /src/animation/frontend | |
| parent | 3edb85002b848033bbeefa33001d19fb514ef489 (diff) | |
| parent | 9d8c9ada161ad97634992c444196add0abb4f9d1 (diff) | |
Merge branch '5.9' into dev
Conflicts:
src/render/backend/renderer.cpp
src/render/backend/renderview.cpp
src/render/graphicshelpers/graphicscontext_p.h
src/render/graphicshelpers/graphicshelperes2_p.h
src/render/graphicshelpers/graphicshelpergl2_p.h
src/render/graphicshelpers/graphicshelpergl3_2_p.h
src/render/graphicshelpers/graphicshelpergl3_3_p.h
src/render/graphicshelpers/graphicshelpergl4_p.h
src/render/graphicshelpers/graphicshelperinterface_p.h
src/render/jobs/pickboundingvolumejob.cpp
tests/auto/animation/clipanimator/tst_clipanimator.cpp
tests/auto/auto.pro
tests/manual/manual.pro
Also disabled the QQmlMetaType codepaths following commit
49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The
QQmlMetaType codepaths will be re-enabled once a qt5.git
integration has succeeded.
Change-Id: Ia654d75425e6d406c472d19864383612208cad2b
Diffstat (limited to 'src/animation/frontend')
| -rw-r--r-- | src/animation/frontend/qadditiveclipblend.cpp | 4 | ||||
| -rw-r--r-- | src/animation/frontend/qblendedclipanimator.cpp | 7 | ||||
| -rw-r--r-- | src/animation/frontend/qclipanimator.cpp | 3 |
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 4fe21828f..19e6eafed 100644 --- a/src/animation/frontend/qclipanimator.cpp +++ b/src/animation/frontend/qclipanimator.cpp @@ -117,12 +117,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 |