diff options
| -rw-r--r-- | src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/animation-keyframe-blendtree/main.qml | 4 | ||||
| -rw-r--r-- | tests/manual/animation-keyframe-simple/main.qml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index fe673b16b..82cc79295 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -76,7 +76,7 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DAnimation::QChannelMapping>(uri, 2, 9, "ChannelMapping"); qmlRegisterType<Qt3DAnimation::QChannelMapping>(uri, 2, 9, "ChannelMapping"); qmlRegisterUncreatableType<Qt3DAnimation::QAbstractAnimationClip>(uri, 2, 9, "AbstractAnimationClip", QStringLiteral("QAbstractAnimationClip is abstract")); - qmlRegisterType<Qt3DAnimation::QAnimationClipLoader>(uri, 2, 9, "AnimationClip"); + qmlRegisterType<Qt3DAnimation::QAnimationClipLoader>(uri, 2, 9, "AnimationClipLoader"); qmlRegisterExtendedType<Qt3DAnimation::QChannelMapper, Qt3DAnimation::Animation::Quick::Quick3DChannelMapper>(uri, 2, 9, "ChannelMapper"); qmlRegisterUncreatableType<Qt3DAnimation::QAbstractClipBlendNode>(uri, 2, 9, "AbstractClipBlendNode", QStringLiteral("QAbstractClipBlendNode is abstract")); diff --git a/tests/manual/animation-keyframe-blendtree/main.qml b/tests/manual/animation-keyframe-blendtree/main.qml index 0c28b8fd3..abc63bffa 100644 --- a/tests/manual/animation-keyframe-blendtree/main.qml +++ b/tests/manual/animation-keyframe-blendtree/main.qml @@ -45,10 +45,10 @@ DefaultSceneEntity { blendTree: LerpClipBlend { blendFactor: 0.2 startClip: ClipBlendValue { - clip: AnimationClip { source: "sliding-cube.json" } + clip: AnimationClipLoader { source: "sliding-cube.json" } } endClip: ClipBlendValue { - clip: AnimationClip { source: "sliding-pulsing-cube.json" } + clip: AnimationClipLoader { source: "sliding-pulsing-cube.json" } } } diff --git a/tests/manual/animation-keyframe-simple/main.qml b/tests/manual/animation-keyframe-simple/main.qml index 17744209a..028427998 100644 --- a/tests/manual/animation-keyframe-simple/main.qml +++ b/tests/manual/animation-keyframe-simple/main.qml @@ -41,7 +41,7 @@ DefaultSceneEntity { loops: 3 onRunningChanged: console.log("running = " + running) - clip: AnimationClip { + clip: AnimationClipLoader { source: "cubeanimation.json" onDurationChanged: console.log("duration = " + duration) } |