Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 4 insertions, 3 deletions

diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p_p.h
index 235870933..4d067f0e6 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p_p.h
@@ -51,11 +51,10 @@
 // We mean it.
 //
 
-#include "quick3dentityloader_p.h"
-
-#include <QQmlComponent>
+#include <QtQml/QQmlComponent>
 
 #include <Qt3DCore/private/qentity_p.h>
+#include <Qt3DQuick/private/quick3dentityloader_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -82,6 +81,7 @@ public:
     void loadComponent(const QUrl &source);
 
     void _q_componentStatusChanged(QQmlComponent::Status status);
+    void setStatus(Quick3DEntityLoader::Status status);
 
     static inline Quick3DEntityLoaderPrivate *get(Quick3DEntityLoader *q) { return q->d_func(); }
 
@@ -90,6 +90,7 @@ public:
     QQmlContext *m_context;
     QQmlComponent *m_component;
     QEntity *m_entity;
+    Quick3DEntityLoader::Status m_status;
 };
 
 } // namespace Quick