diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-17 14:28:37 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-17 14:32:25 +0200 |
commit | 1a75f9b07148042803d4366a8a21d6f2d62deee5 (patch) | |
tree | c769a9a67ddd7dbf3a3b8d9cc0e9cbc12e97a03a | |
parent | 0f02a2e906b9372fe592b106773b809b68cad3f7 (diff) |
Register Qt3DCore::QNode also for Qt3D.Animation
It's not pretty, but it makes the properties added to QNode in revision
9 available to derived animation types registered for version 2.9.
Fixes: QTBUG-61942
Change-Id: I118d4c508f3c201d61983d3224ceaf79edaf8ee6
Reviewed-by: Michael Brasser <michael.brasser@live.com>
-rw-r--r-- | src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index f101d17d3..efb9fa706 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -58,6 +58,7 @@ #include <Qt3DAnimation/qmorphtarget.h> #include <Qt3DAnimation/qvertexblendanimation.h> +#include <Qt3DQuick/private/quick3dnodev9_p.h> #include <Qt3DQuickAnimation/private/qt3dquickanimation_global_p.h> #include <Qt3DQuickAnimation/private/quick3dchannelmapper_p.h> #include <Qt3DQuickAnimation/private/quick3dkeyframeanimation_p.h> @@ -74,6 +75,7 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) Qt3DAnimation::Quick::Quick3DAnimation_initialize(); // @uri Qt3D.Animation + qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNodeV9, 9>(uri, 2, 9, "Node", QStringLiteral("Node is a base class")); qmlRegisterUncreatableType<Qt3DAnimation::QAbstractClipAnimator>(uri, 2, 9, "AbstractClipAnimator", QStringLiteral("QAbstractClipAnimator is abstract")); qmlRegisterType<Qt3DAnimation::QClipAnimator>(uri, 2, 9, "ClipAnimator"); qmlRegisterType<Qt3DAnimation::QBlendedClipAnimator>(uri, 2, 9, "BlendedClipAnimator"); |