diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:00:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:00:47 +0200 |
| commit | 1c8066c6bfa261bc432f0c4ffddd0f302415077f (patch) | |
| tree | 5fa54a8aec2ab1b94a4133378edaa3937769c402 | |
| parent | e549220a5daaedb13f167d6cde4a181666faec63 (diff) | |
| parent | f575334691dedc5e34e6391fe638f313de8270eb (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: If9d27bf336dd4d22a06662a5e189ca18b2ba2e76
| -rw-r--r-- | src/animation/frontend/qanimationaspect.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp index 9b23a7b1d..a25eb533e 100644 --- a/src/animation/frontend/qanimationaspect.cpp +++ b/src/animation/frontend/qanimationaspect.cpp @@ -96,6 +96,7 @@ QAnimationAspect::QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent) qRegisterMetaType<Qt3DAnimation::QAnimationClipLoader*>(); qRegisterMetaType<Qt3DAnimation::QChannelMapper*>(); qRegisterMetaType<QVector<Qt3DCore::Sqt>>(); + qRegisterMetaType<Qt3DAnimation::QAbstractAnimationClip*>(); registerBackendType<QAbstractAnimationClip>( QSharedPointer<Animation::NodeFunctor<Animation::AnimationClip, Animation::AnimationClipLoaderManager>>::create(d->m_handler.data(), |