diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-22 10:21:05 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-24 20:41:36 +0000 |
| commit | de28bb3aafdfc2dec80aa65cd426bf2b74718358 (patch) | |
| tree | 6eb6c5f3724ca876e50cc69b5bcce141ebe0191c /src/quick3d/imports | |
| parent | d9d2f46e402a29c9e52279ec257f76320e699c9b (diff) | |
Rename QLerpBlend to QLerpClipBlend
Also rename backend class accordingly.
Task-number: QTBUG-58904
Change-Id: I3a8d3898507e5055c2727e4bb1b19b06fdba988b
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index 53cc0f5ce..6f52de389 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -44,7 +44,7 @@ #include <Qt3DAnimation/qblendedclipanimator.h> #include <Qt3DAnimation/qclipanimator.h> #include <Qt3DAnimation/qchannelmapping.h> -#include <Qt3DAnimation/qlerpblend.h> +#include <Qt3DAnimation/qlerpclipblend.h> #include <Qt3DAnimation/qadditiveblend.h> #include <Qt3DAnimation/qkeyframeanimation.h> @@ -81,8 +81,8 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) Qt3DAnimation::Animation::Quick::Quick3DChannelMapper>(uri, 2, 9, "ChannelMapper"); qmlRegisterExtendedUncreatableType<Qt3DAnimation::QAbstractClipBlendNode, Qt3DAnimation::Animation::Quick::Quick3DAbstractClipBlendNode>(uri, 2, 9, "AbstractClipBlendNode", QStringLiteral("QAbstractClipBlendNode is abstract")); - qmlRegisterType<Qt3DAnimation::QLerpBlend>(uri, 2, 9, "LerpBlend"); qmlRegisterType<Qt3DAnimation::QAdditiveBlend>(uri, 2, 9, "AdditiveBlend"); + qmlRegisterType<Qt3DAnimation::QLerpClipBlend>(uri, 2, 9, "LerpClipBlend"); qmlRegisterUncreatableType<Qt3DAnimation::QAbstractAnimation>(uri, 2, 9, "AbstractAnimation", QStringLiteral("AbstractAnimation is abstract")); qmlRegisterExtendedType<Qt3DAnimation::QKeyframeAnimation, Qt3DAnimation::Quick::QQuick3DKeyframeAnimation>(uri, 2, 9, "KeyframeAnimation"); |