summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3d/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d/quick3d/items')
-rw-r--r--src/quick3d/quick3d/items/quick3dentityloader.cpp8
-rw-r--r--src/quick3d/quick3d/items/quick3dentityloader_p.h1
2 files changed, 8 insertions, 1 deletions
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 63f4cceac..9f305d977 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -54,7 +54,7 @@ class Quick3DEntityLoaderIncubator : public QQmlIncubator
{
public:
Quick3DEntityLoaderIncubator(Quick3DEntityLoader *loader)
- : QQmlIncubator(Asynchronous),
+ : QQmlIncubator(AsynchronousIfNested),
m_loader(loader)
{
}
@@ -100,6 +100,12 @@ Quick3DEntityLoader::Quick3DEntityLoader(QNode *parent)
{
}
+Quick3DEntityLoader::~Quick3DEntityLoader()
+{
+ Q_D(Quick3DEntityLoader);
+ d->clear();
+}
+
/*!
\qmlproperty QtQml::QtObject Qt3DCore::EntityLoader::entity
\readonly
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h
index 928f31ada..5721af115 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -76,6 +76,7 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
public:
explicit Quick3DEntityLoader(QNode *parent = 0);
+ ~Quick3DEntityLoader();
QObject *entity() const;