diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index b72ee9600..3ff63d9d9 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -38,14 +38,17 @@ ****************************************************************************/ #include "qt3dquick3dcoreplugin.h" + #include <Qt3DCore/qtransform.h> -#include <private/quick3dentity_p.h> -#include <private/quick3dentityloader_p.h> -#include <private/quick3dnodeinstantiator_p.h> -#include <private/qquaternionanimation_p.h> -#include <private/qt3dquick_global_p.h> #include <QtCore/qvariantanimation.h> +#include <Qt3DQuick/private/quick3dnodev9_p.h> +#include <Qt3DQuick/private/quick3dentity_p.h> +#include <Qt3DQuick/private/quick3dentityloader_p.h> +#include <Qt3DQuick/private/quick3dnodeinstantiator_p.h> +#include <Qt3DQuick/private/qquaternionanimation_p.h> +#include <Qt3DQuick/private/qt3dquick_global_p.h> + QT_BEGIN_NAMESPACE void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) @@ -65,6 +68,12 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) // Ideally we want to make Node an uncreatable type // We would need qmlRegisterUncreatableExtendedType for that qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class")); + qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNodeV9, 9>(uri, 2, 9, "Node", QStringLiteral("Node is a base class")); +} + +Qt3DQuick3DCorePlugin::~Qt3DQuick3DCorePlugin() +{ + Qt3DCore::Quick::Quick3D_uninitialize(); } QT_END_NAMESPACE |