summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-02-15 10:19:23 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-16 10:29:19 +0000
commit9dd10069ad84a7d51bb890d78f7f5e1e79b94906 (patch)
treebd86e5e48a4c6e0969cdfae8822b323b29ccf821 /src/quick3d/imports
parenta6297cdbc6025cd676691d67e6c8e34ebbab5c29 (diff)
Remove QConductedClipAnimator and defer to later
Too much to fix up for 5.9 so remove and defer for 5.10. Task-number: QTBUG-58905 Change-Id: Ie5b4f172e57beac12933fa0db5f102b4dc9346fc Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/quick3d/imports')
-rw-r--r--src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
index bd54f73e8..334bf378f 100644
--- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
+++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
@@ -41,7 +41,6 @@
#include <Qt3DAnimation/qanimationclip.h>
#include <Qt3DAnimation/qblendedclipanimator.h>
#include <Qt3DAnimation/qclipanimator.h>
-#include <Qt3DAnimation/qconductedclipanimator.h>
#include <Qt3DAnimation/qchannelmapping.h>
#include <Qt3DAnimation/qlerpblend.h>
#include <Qt3DAnimation/qadditiveblend.h>
@@ -72,7 +71,6 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3DAnimation::QAnimationClip>(uri, 2, 2, "AnimationClip");
qmlRegisterType<Qt3DAnimation::QClipAnimator>(uri, 2, 2, "ClipAnimator");
qmlRegisterType<Qt3DAnimation::QBlendedClipAnimator>(uri, 2, 2, "BlendedClipAnimator");
- qmlRegisterType<Qt3DAnimation::QConductedClipAnimator>(uri, 2, 2, "ConductedClipAnimator");
qmlRegisterType<Qt3DAnimation::QChannelMapping>(uri, 2, 2, "ChannelMapping");
qmlRegisterExtendedType<Qt3DAnimation::QChannelMapper,
Qt3DAnimation::Animation::Quick::Quick3DChannelMapper>(uri, 2, 2, "ChannelMapper");