diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-03-24 13:21:25 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-03-26 07:29:29 +0000 |
commit | 9a5139a2b59ac27afa190caa46ba22138f9dfa6c (patch) | |
tree | e0ceb21228fd923aa72cdeb87d637377ae92060a /src/quick3d/imports | |
parent | 78280da782ea8c1882afe18ee611aa199e914418 (diff) |
Remove clips property from QAbstractClipBlendNode and friends
No longer needed as concrete subclasses each provide their own specific
APIs for managing clips or sub trees.
Change-Id: I8e090bcf18ad9bf0d19e36128d7556aaa6cd6edf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports')
-rw-r--r-- | src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index 85c5c270c..fe673b16b 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -57,7 +57,6 @@ #include <Qt3DQuickAnimation/private/qt3dquickanimation_global_p.h> #include <Qt3DQuickAnimation/private/quick3dchannelmapper_p.h> -#include <Qt3DQuickAnimation/private/quick3dabstractclipblendnode_p.h> #include <Qt3DQuickAnimation/private/quick3dkeyframeanimation_p.h> #include <Qt3DQuickAnimation/private/quick3danimationgroup_p.h> #include <Qt3DQuickAnimation/private/quick3danimationcontroller_p.h> @@ -80,8 +79,7 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DAnimation::QAnimationClipLoader>(uri, 2, 9, "AnimationClip"); qmlRegisterExtendedType<Qt3DAnimation::QChannelMapper, Qt3DAnimation::Animation::Quick::Quick3DChannelMapper>(uri, 2, 9, "ChannelMapper"); - qmlRegisterExtendedUncreatableType<Qt3DAnimation::QAbstractClipBlendNode, - Qt3DAnimation::Animation::Quick::Quick3DAbstractClipBlendNode>(uri, 2, 9, "AbstractClipBlendNode", QStringLiteral("QAbstractClipBlendNode is abstract")); + qmlRegisterUncreatableType<Qt3DAnimation::QAbstractClipBlendNode>(uri, 2, 9, "AbstractClipBlendNode", QStringLiteral("QAbstractClipBlendNode is abstract")); qmlRegisterType<Qt3DAnimation::QLerpClipBlend>(uri, 2, 9, "LerpClipBlend"); qmlRegisterType<Qt3DAnimation::QAdditiveClipBlend>(uri, 2, 9, "AdditiveClipBlend"); qmlRegisterType<Qt3DAnimation::QClipBlendValue>(uri, 2, 9, "ClipBlendValue"); |