8 files changed, 7 insertions, 55 deletions
diff --git a/src/quick3d/quick3d/items/items.pri b/src/quick3d/quick3d/items/items.pri
deleted file mode 100644
index 28b56eaab..000000000
--- a/src/quick3d/quick3d/items/items.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-HEADERS += \
-    $$PWD/quick3dnodeinstantiator_p.h \
-    $$PWD/quick3dentity_p.h \
-    $$PWD/quick3dentityloader_p_p.h \
-    $$PWD/quick3dentityloader_p.h \
-    $$PWD/quick3dnode_p.h \
-    $$PWD/quick3djoint_p.h \
-    $$PWD/quick3dbuffer_p.h \
-    $$PWD/quick3dgeometry_p.h
-
-SOURCES += \
-    $$PWD/quick3dnode.cpp \
-    $$PWD/quick3dentity.cpp \
-    $$PWD/quick3dentityloader.cpp \
-    $$PWD/quick3dnodeinstantiator.cpp \
-    $$PWD/quick3djoint.cpp \
-    $$PWD/quick3dbuffer.cpp \
-    $$PWD/quick3dgeometry.cpp
-
-INCLUDEPATH += $$PWD
diff --git a/src/quick3d/quick3d/items/quick3dbuffer.cpp b/src/quick3d/quick3d/items/quick3dbuffer.cpp
index bc2c6d6df..0fa8ada23 100644
--- a/src/quick3d/quick3d/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3d/items/quick3dbuffer.cpp
@@ -35,13 +35,8 @@ QByteArray Quick3DBuffer::convertToRawData(const QJSValue &jsValue)
     Q_ASSERT(m_v4engine);
     QV4::Scope scope(m_v4engine);
     QV4::Scoped<QV4::TypedArray> typedArray(scope,
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
                                             QJSValuePrivate::convertToReturnedValue(m_v4engine, jsValue));
     char *dataPtr = reinterpret_cast<char *>(typedArray->arrayData());
-#else
-                                            QJSValuePrivate::convertedToValue(m_v4engine, jsValue));
-    char *dataPtr = reinterpret_cast<char *>(typedArray->arrayData()->data());
-#endif
     if (!typedArray)
         return QByteArray();
 
diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp
index d7487b716..b1cdfb4ab 100644
--- a/src/quick3d/quick3d/items/quick3dentity.cpp
+++ b/src/quick3d/quick3d/items/quick3dentity.cpp
@@ -45,12 +45,7 @@ Quick3DEntity::Quick3DEntity(QObject *parent)
 
 QQmlListProperty<QComponent> Quick3DEntity::componentList()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     using qt_size_type = qsizetype;
-#else
-    using qt_size_type = int;
-#endif
-
     using ListContentType = Qt3DCore::QComponent;
     auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *comp) {
         if (comp == nullptr)
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 86e307065..ca25df63c 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -134,7 +134,7 @@ QObject *Quick3DEntityLoader::entity() const
 }
 
 /*!
-    \qmlproperty url Qt3DCore::EntityLoader::source
+    \qmlproperty url Qt3D.Core::EntityLoader::source
     Holds the source url.
 */
 QUrl Quick3DEntityLoader::source() const
@@ -175,7 +175,7 @@ void Quick3DEntityLoader::setSourceComponent(QQmlComponent *component)
 }
 
 /*!
-    \qmlproperty Status Qt3DCore::EntityLoader::status
+    \qmlproperty Status Qt3D.Core::EntityLoader::status
 
     Holds the status of the entity loader.
     \list
diff --git a/src/quick3d/quick3d/items/quick3dgeometry.cpp b/src/quick3d/quick3d/items/quick3dgeometry.cpp
index 0a4912df1..5a71de7a4 100644
--- a/src/quick3d/quick3d/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3d/items/quick3dgeometry.cpp
@@ -15,12 +15,7 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent)
 
 QQmlListProperty<Qt3DCore::QAttribute> Quick3DGeometry::attributeList()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     using qt_size_type = qsizetype;
-#else
-    using qt_size_type = int;
-#endif
-
     using ListContentType = Qt3DCore::QAttribute;
     auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *attribute) {
         Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
diff --git a/src/quick3d/quick3d/items/quick3djoint.cpp b/src/quick3d/quick3d/items/quick3djoint.cpp
index baa79dd56..cfe77b0a7 100644
--- a/src/quick3d/quick3d/items/quick3djoint.cpp
+++ b/src/quick3d/quick3d/items/quick3djoint.cpp
@@ -15,17 +15,12 @@ Quick3DJoint::Quick3DJoint(QObject *parent)
 }
 
 /*!
-    \qmlproperty list<Joint> Qt3DCore::Joint::childJoints
+    \qmlproperty list<Joint> Qt3D.Core::Joint::childJoints
     \readonly
 */
 QQmlListProperty<QJoint> Quick3DJoint::childJoints()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     using qt_size_type = qsizetype;
-#else
-    using qt_size_type = int;
-#endif
-
     using ListContentType = QJoint;
     auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *joint) {
         Quick3DJoint *jointExtension = qobject_cast<Quick3DJoint *>(list->object);
diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp
index 969874136..09abcf2ae 100644
--- a/src/quick3d/quick3d/items/quick3dnode.cpp
+++ b/src/quick3d/quick3d/items/quick3dnode.cpp
@@ -25,18 +25,13 @@ Quick3DNode::Quick3DNode(QObject *parent)
 }
 
 /*!
-    \qmlproperty list<QtQml::QtObject> Qt3DCore::Node::data
+    \qmlproperty list<QtQml::QtObject> Qt3D.Core::Node::data
     \qmldefault
 */
 
 QQmlListProperty<QObject> Quick3DNode::data()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     using qt_size_type = qsizetype;
-#else
-    using qt_size_type = int;
-#endif
-
     using ListContentType = QObject;
     auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *obj) {
         if (!obj)
@@ -63,18 +58,13 @@ QQmlListProperty<QObject> Quick3DNode::data()
 }
 
 /*!
-    \qmlproperty list<Node> Qt3DCore::Node::childNodes
+    \qmlproperty list<Node> Qt3D.Core::Node::childNodes
     \readonly
 */
 
 QQmlListProperty<QNode> Quick3DNode::childNodes()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     using qt_size_type = qsizetype;
-#else
-    using qt_size_type = int;
-#endif
-
     using ListContentType = QNode;
     auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *obj) {
         if (!obj)
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index 1f9e5d068..b7fb10f77 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -17,6 +17,8 @@
 #endif
 #include <private/qqmlobjectmodel_p.h>
 
+#include <QtCore/qpointer.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {