QNode: make cleanup a private slot

QT3D_CLONEABLE now implements a default dtor that calls _q_ cleanup
QT3D_CLONEABLE_CUSTOM_DTOR is used for classes that really need to implement
their own dtor but they need to invoke _q_cleanup manually

Change-Id: I2937a3b9edeb5a763749f0044360d78ab4461a5e
Task-number: QTBUG-51464
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

223 files changed, 57 insertions, 838 deletions

diff --git a/examples/qt3d/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp
index 186a0b3e1..87474f6e1 100644
--- a/examples/qt3d/materials-cpp/renderableentity.cpp
+++ b/examples/qt3d/materials-cpp/renderableentity.cpp
@@ -59,11 +59,6 @@ RenderableEntity::RenderableEntity(Qt3DCore::QNode *parent)
     addComponent(m_transform);
 }
 
-RenderableEntity::~RenderableEntity()
-{
-    QNode::cleanup();
-}
-
 Qt3DRender::QMesh *RenderableEntity::mesh() const
 {
     return m_mesh;
diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h
index 19ad81691..5ed767b54 100644
--- a/examples/qt3d/materials-cpp/renderableentity.h
+++ b/examples/qt3d/materials-cpp/renderableentity.h
@@ -59,7 +59,6 @@ class RenderableEntity : public Qt3DCore::QEntity
 {
 public:
     RenderableEntity(Qt3DCore::QNode *parent = 0);
-    ~RenderableEntity();
 
     Qt3DRender::QMesh *mesh() const;
     Qt3DCore::QTransform *transform() const;
diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
index 4e9edc097..33e062971 100644
--- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
@@ -101,9 +101,4 @@ TessellatedQuadMesh::TessellatedQuadMesh(Qt3DCore::QNode *parent)
     setGeometry(new TessellatedGeometry(this));
 }
 
-TessellatedQuadMesh::~TessellatedQuadMesh()
-{
-    QNode::cleanup();
-}
-
 #include "tessellatedquadmesh.moc"
diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
index 2bf1bd31b..e60c54e86 100644
--- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
@@ -58,7 +58,6 @@ class TessellatedQuadMesh : public Qt3DRender::QGeometryRenderer
     Q_OBJECT
 public:
     explicit TessellatedQuadMesh(Qt3DCore::QNode *parent = 0);
-    ~TessellatedQuadMesh();
 };
 
 #endif // TESSELLATEDQUAD_H
diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp
index 5dd88680c..2e84e9d69 100644
--- a/src/core/nodes/qentity.cpp
+++ b/src/core/nodes/qentity.cpp
@@ -98,7 +98,7 @@ QEntity::~QEntity()
     for (QComponent *comp : components)
         removeComponent(comp);
 
-    QNode::cleanup();
+    QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     // If all children are removed
     // That includes the components that are parented by this entity
 
diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h
index a84758857..0560ae256 100644
--- a/src/core/nodes/qentity.h
+++ b/src/core/nodes/qentity.h
@@ -74,7 +74,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QEntity)
-    QT3D_CLONEABLE(QEntity)
+    QT3D_CLONEABLE_CUSTOM_DTOR(QEntity)
     QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
 };
 
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index f144bb6a5..9f31630a6 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -191,6 +191,28 @@ void QNodePrivate::_q_removeChild(QNode *childNode)
     }
 }
 
+/*!
+ * This methods can only be called once and takes care of notyfing the backend
+ * aspects that the current Qt3DCore::QNode instance is about to be destroyed.
+ *
+ * \note It must be called by the destructor of every class subclassing
+ * QNode that is clonable (using the QT3D_CLONEABLE macro).
+ *
+ * \internal
+ */
+void QNodePrivate::_q_cleanup()
+{
+    if (!m_wasCleanedUp) {
+        m_wasCleanedUp = true;
+        Q_Q(QNode);
+        qCDebug(Nodes) << Q_FUNC_INFO << q;
+        if (q->parentNode())
+            QNodePrivate::get(q->parentNode())->_q_removeChild(q);
+        // Root element has no parent and therefore we cannot
+        // call parent->_q_removeChild();
+    }
+}
+
 void QNodePrivate::registerNotifiedProperties()
 {
     Q_Q(QNode);
@@ -699,26 +721,6 @@ QNode *QNode::clone(QNode *node)
     return clonedNode;
 }
 
-/*!
- * This methods can only be called once and takes care of notyfing the backend
- * aspects that the current Qt3DCore::QNode instance is about to be destroyed.
- *
- * \note It must be called by the destructor of every class subclassing
- * QNode that is clonable (using the QT3D_CLONEABLE macro).
- */
-void QNode::cleanup()
-{
-    Q_D(QNode);
-    if (!d->m_wasCleanedUp) {
-        d->m_wasCleanedUp = true;
-        qCDebug(Nodes) << Q_FUNC_INFO << this;
-        if (parentNode())
-            QNodePrivate::get(parentNode())->_q_removeChild(this);
-        // Root element has no parent and therefore we cannot
-        // call parent->_q_removeChild();
-    }
-}
-
 QNodeCreatedChangeBasePtr QNode::createNodeCreationChange() const
 {
     // TODO: Remove the qDebug() from this default implementation
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index dc4736df2..cf9ec46a7 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -68,8 +68,20 @@ typedef QSharedPointer<QNode> QNodePtr;
         Class *clone_ = Qt3DCore::QAbstractNodeFactory::createNode<Class>(QT3DCORE_QUOTE(Class)); \
         clone_->copy(this);                   \
         return clone_;                        \
+    }                                         \
+    public:                                   \
+    virtual ~Class() {                        \
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection); \
     }
 
+#define QT3D_CLONEABLE_CUSTOM_DTOR(Class)                \
+    friend class Qt3DCore::QAbstractNodeFactory;       \
+    QNode *doClone() const Q_DECL_OVERRIDE { \
+        Class *clone_ = Qt3DCore::QAbstractNodeFactory::createNode<Class>(QT3DCORE_QUOTE(Class)); \
+        clone_->copy(this);                   \
+        return clone_;                        \
+    }                                         \
+
 // Each QNode subclass should call QNode::cleanup in it dtor
 // QNode::cleanup checks that a flags wasn't set to true,
 // sets it to true and sends a clone to the backend
@@ -109,8 +121,6 @@ protected:
     virtual void copy(const QNode *ref);
     virtual void sceneChangeEvent(const QSceneChangePtr &change);
 
-    void cleanup();
-
 private:
     Q_DECLARE_PRIVATE(QNode)
     virtual QNode *doClone() const = 0;
@@ -123,6 +133,7 @@ private:
 
     Q_PRIVATE_SLOT(d_func(), void _q_addChild(Qt3DCore::QNode *))
     Q_PRIVATE_SLOT(d_func(), void _q_removeChild(Qt3DCore::QNode *))
+    Q_PRIVATE_SLOT(d_func(), void _q_cleanup())
 
     friend class QAspectEngine;
     friend class QAspectEnginePrivate;
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index 8fab0817a..3b0ee3773 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -99,6 +99,7 @@ public:
 private:
     void _q_addChild(QNode *childNode);
     void _q_removeChild(QNode *childNode);
+    void _q_cleanup();
     void registerNotifiedProperties();
     void unregisterNotifiedProperties();
     void propertyChanged(int propertyIndex);
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index 4b5ea1977..960cce33c 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -186,14 +186,6 @@ QTransform::QTransform(QTransformPrivate &dd, QNode *parent)
 {
 }
 
-QTransform::~QTransform()
-{
-    QNode::cleanup();
-}
-
-/*!
- * Copies \a ref.
- */
 void QTransform::copy(const QNode *ref)
 {
     QComponent::copy(ref);
diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h
index c77217e07..e8dab0758 100644
--- a/src/core/transforms/qtransform.h
+++ b/src/core/transforms/qtransform.h
@@ -65,7 +65,6 @@ class QT3DCORESHARED_EXPORT QTransform : public QComponent
 
 public:
     explicit QTransform(QNode *parent = Q_NULLPTR);
-    ~QTransform();
 
     float scale() const;
     QVector3D scale3D() const;
diff --git a/src/extras/defaults/qskyboxentity.cpp b/src/extras/defaults/qskyboxentity.cpp
index 973532fff..30e42a7a6 100644
--- a/src/extras/defaults/qskyboxentity.cpp
+++ b/src/extras/defaults/qskyboxentity.cpp
@@ -218,11 +218,6 @@ QSkyboxEntity::QSkyboxEntity(QNode *parent)
     d_func()->init();
 }
 
-QSkyboxEntity::~QSkyboxEntity()
-{
-    QNode::cleanup();
-}
-
 /*!
  * Sets the base name to \a baseName.
  */
diff --git a/src/extras/defaults/qskyboxentity.h b/src/extras/defaults/qskyboxentity.h
index 7112bff4c..b0b97cc3e 100644
--- a/src/extras/defaults/qskyboxentity.h
+++ b/src/extras/defaults/qskyboxentity.h
@@ -54,7 +54,6 @@ class QT3DEXTRASSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity
     Q_OBJECT
 public:
     explicit QSkyboxEntity(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QSkyboxEntity();
 
     void setBaseName(const QString &path);
     QString baseName() const;
diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp
index 4d1c4ce17..b35d7155c 100644
--- a/src/extras/geometries/qconegeometry.cpp
+++ b/src/extras/geometries/qconegeometry.cpp
@@ -415,11 +415,6 @@ QConeGeometry::QConeGeometry(QConeGeometryPrivate &dd, QNode *parent)
     d->init();
 }
 
-QConeGeometry::~QConeGeometry()
-{
-    QGeometry::cleanup();
-}
-
 void QConeGeometry::updateVertices()
 {
     Q_D(QConeGeometry);
diff --git a/src/extras/geometries/qconegeometry.h b/src/extras/geometries/qconegeometry.h
index 4f1dc944a..c581da59a 100644
--- a/src/extras/geometries/qconegeometry.h
+++ b/src/extras/geometries/qconegeometry.h
@@ -70,7 +70,6 @@ class QT3DEXTRASSHARED_EXPORT QConeGeometry : public Qt3DRender::QGeometry
 
 public:
     explicit QConeGeometry(QNode *parent = nullptr);
-    ~QConeGeometry();
 
     void updateVertices();
     void updateIndices();
diff --git a/src/extras/geometries/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp
index 621e06046..6e9415895 100644
--- a/src/extras/geometries/qconemesh.cpp
+++ b/src/extras/geometries/qconemesh.cpp
@@ -68,11 +68,6 @@ QConeMesh::QConeMesh(QNode *parent)
     QGeometryRenderer::setGeometry(geometry);
 }
 
-QConeMesh::~QConeMesh()
-{
-    QNode::cleanup();
-}
-
 void QConeMesh::setHasTopEndcap(bool hasTopEndcap)
 {
     static_cast<QConeGeometry *>(geometry())->setHasTopEndcap(hasTopEndcap);
diff --git a/src/extras/geometries/qconemesh.h b/src/extras/geometries/qconemesh.h
index c32070e5c..0dc546ea7 100644
--- a/src/extras/geometries/qconemesh.h
+++ b/src/extras/geometries/qconemesh.h
@@ -59,7 +59,6 @@ class QT3DEXTRASSHARED_EXPORT QConeMesh : public Qt3DRender::QGeometryRenderer
     Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged)
 public:
     explicit QConeMesh(Qt3DCore::QNode *parent = nullptr);
-    ~QConeMesh();
 
     int rings() const;
     int slices() const;
diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp
index b62ae0022..cc45e0785 100644
--- a/src/extras/geometries/qcuboidgeometry.cpp
+++ b/src/extras/geometries/qcuboidgeometry.cpp
@@ -595,14 +595,6 @@ QCuboidGeometry::QCuboidGeometry(QCuboidGeometryPrivate &dd, QNode *parent)
 }
 
 /*!
- * Destroys this geometry.
- */
-QCuboidGeometry::~QCuboidGeometry()
-{
-    QGeometry::cleanup();
-}
-
-/*!
  * Updates indices based on mesh resolutions.
  */
 void QCuboidGeometry::updateIndices()
diff --git a/src/extras/geometries/qcuboidgeometry.h b/src/extras/geometries/qcuboidgeometry.h
index 7fa5f58ff..3ce52e3bd 100644
--- a/src/extras/geometries/qcuboidgeometry.h
+++ b/src/extras/geometries/qcuboidgeometry.h
@@ -73,7 +73,6 @@ class QT3DEXTRASSHARED_EXPORT QCuboidGeometry : public Qt3DRender::QGeometry
 
 public:
     explicit QCuboidGeometry(QNode *parent = Q_NULLPTR);
-    ~QCuboidGeometry();
 
     void updateIndices();
     void updateVertices();
diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp
index 99cfa4733..ac5b164c6 100644
--- a/src/extras/geometries/qcuboidmesh.cpp
+++ b/src/extras/geometries/qcuboidmesh.cpp
@@ -112,14 +112,6 @@ QCuboidMesh::QCuboidMesh(QNode *parent)
     QGeometryRenderer::setGeometry(geometry);
 }
 
-/*!
- * Destroys this cube mesh.
- */
-QCuboidMesh::~QCuboidMesh()
-{
-    QNode::cleanup();
-}
-
 void QCuboidMesh::setXExtent(float xExtent)
 {
     static_cast<QCuboidGeometry *>(geometry())->setXExtent(xExtent);
diff --git a/src/extras/geometries/qcuboidmesh.h b/src/extras/geometries/qcuboidmesh.h
index 72f6a007d..e06d09306 100644
--- a/src/extras/geometries/qcuboidmesh.h
+++ b/src/extras/geometries/qcuboidmesh.h
@@ -61,7 +61,6 @@ class QT3DEXTRASSHARED_EXPORT QCuboidMesh : public Qt3DRender::QGeometryRenderer
 
 public:
     explicit QCuboidMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QCuboidMesh();
 
     float xExtent() const;
     float yExtent() const;
diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp
index f514d0dc9..c0511c0e6 100644
--- a/src/extras/geometries/qcylindergeometry.cpp
+++ b/src/extras/geometries/qcylindergeometry.cpp
@@ -417,14 +417,6 @@ QCylinderGeometry::QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent
 }
 
 /*!
- * Destroys the geometry.
- */
-QCylinderGeometry::~QCylinderGeometry()
-{
-    QGeometry::cleanup();
-}
-
-/*!
  * Updates the vertices based on rings and slices.
  */
 void QCylinderGeometry::updateVertices()
diff --git a/src/extras/geometries/qcylindergeometry.h b/src/extras/geometries/qcylindergeometry.h
index 570b2b25d..4d524b4f8 100644
--- a/src/extras/geometries/qcylindergeometry.h
+++ b/src/extras/geometries/qcylindergeometry.h
@@ -68,7 +68,6 @@ class QT3DEXTRASSHARED_EXPORT QCylinderGeometry : public Qt3DRender::QGeometry
 
 public:
     explicit QCylinderGeometry(QNode *parent = Q_NULLPTR);
-    ~QCylinderGeometry();
 
     void updateVertices();
     void updateIndices();
diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp
index 9cbf729a6..5a4e2c6a0 100644
--- a/src/extras/geometries/qcylindermesh.cpp
+++ b/src/extras/geometries/qcylindermesh.cpp
@@ -111,14 +111,6 @@ QCylinderMesh::QCylinderMesh(QNode *parent)
     QGeometryRenderer::setGeometry(geometry);
 }
 
-/*!
- * Destroys this cylinder mesh.
- */
-QCylinderMesh::~QCylinderMesh()
-{
-    QNode::cleanup();
-}
-
 void QCylinderMesh::setRings(int rings)
 {
     static_cast<QCylinderGeometry *>(geometry())->setRings(rings);
diff --git a/src/extras/geometries/qcylindermesh.h b/src/extras/geometries/qcylindermesh.h
index 256508576..63a497607 100644
--- a/src/extras/geometries/qcylindermesh.h
+++ b/src/extras/geometries/qcylindermesh.h
@@ -57,7 +57,6 @@ class QT3DEXTRASSHARED_EXPORT QCylinderMesh : public Qt3DRender::QGeometryRender
     Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged)
 public:
     explicit QCylinderMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QCylinderMesh();
 
     int rings() const;
     int slices() const;
diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp
index a0c0ffbc0..49beee4be 100644
--- a/src/extras/geometries/qplanegeometry.cpp
+++ b/src/extras/geometries/qplanegeometry.cpp
@@ -288,14 +288,6 @@ QPlaneGeometry::QPlaneGeometry(QPlaneGeometryPrivate &dd, QNode *parent)
 }
 
 /*!
- * Destroys this geometry.
- */
-QPlaneGeometry::~QPlaneGeometry()
-{
-    QGeometry::cleanup();
-}
-
-/*!
  * Updates vertices based on resolution.
  */
 void QPlaneGeometry::updateVertices()
diff --git a/src/extras/geometries/qplanegeometry.h b/src/extras/geometries/qplanegeometry.h
index 708ea931d..a9031f780 100644
--- a/src/extras/geometries/qplanegeometry.h
+++ b/src/extras/geometries/qplanegeometry.h
@@ -70,7 +70,6 @@ class QT3DEXTRASSHARED_EXPORT QPlaneGeometry : public Qt3DRender::QGeometry
 
 public:
     explicit QPlaneGeometry(QNode *parent = Q_NULLPTR);
-    ~QPlaneGeometry();
 
     void updateVertices();
     void updateIndices();
diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp
index 4c6cc914d..34bdbc5ee 100644
--- a/src/extras/geometries/qplanemesh.cpp
+++ b/src/extras/geometries/qplanemesh.cpp
@@ -91,14 +91,6 @@ QPlaneMesh::QPlaneMesh(QNode *parent)
     QGeometryRenderer::setGeometry(geometry);
 }
 
-/*!
- * Destroys this plane mesh.
- */
-QPlaneMesh::~QPlaneMesh()
-{
-    QNode::cleanup();
-}
-
 void QPlaneMesh::setWidth(float width)
 {
     static_cast<QPlaneGeometry *>(geometry())->setWidth(width);
diff --git a/src/extras/geometries/qplanemesh.h b/src/extras/geometries/qplanemesh.h
index 45edbdf45..4f05a3896 100644
--- a/src/extras/geometries/qplanemesh.h
+++ b/src/extras/geometries/qplanemesh.h
@@ -57,7 +57,6 @@ class QT3DEXTRASSHARED_EXPORT QPlaneMesh : public Qt3DRender::QGeometryRenderer
 
 public:
     explicit QPlaneMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QPlaneMesh();
 
     float width() const;
     float height() const;
diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp
index 0e610346c..60fd5fd75 100644
--- a/src/extras/geometries/qspheregeometry.cpp
+++ b/src/extras/geometries/qspheregeometry.cpp
@@ -401,14 +401,6 @@ QSphereGeometry::QSphereGeometry(QSphereGeometryPrivate &dd, QNode *parent)
 }
 
 /*!
- * Destroys this geometry.
- */
-QSphereGeometry::~QSphereGeometry()
-{
-    QGeometry::cleanup();
-}
-
-/*!
  * Updates vertices based on rings and slices.
  */
 void QSphereGeometry::updateVertices()
diff --git a/src/extras/geometries/qspheregeometry.h b/src/extras/geometries/qspheregeometry.h
index acc908d35..9f2d661e4 100644
--- a/src/extras/geometries/qspheregeometry.h
+++ b/src/extras/geometries/qspheregeometry.h
@@ -70,7 +70,6 @@ class QT3DEXTRASSHARED_EXPORT QSphereGeometry : public Qt3DRender::QGeometry
 
 public:
     explicit QSphereGeometry(QNode *parent = Q_NULLPTR);
-    ~QSphereGeometry();
 
     void updateVertices();
     void updateIndices();
diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp
index d5c4a1317..a17145181 100644
--- a/src/extras/geometries/qspheremesh.cpp
+++ b/src/extras/geometries/qspheremesh.cpp
@@ -99,14 +99,6 @@ QSphereMesh::QSphereMesh(QNode *parent)
     QGeometryRenderer::setGeometry(geometry);
 }
 
-/*!
- * Destroys this sphere mesh.
- */
-QSphereMesh::~QSphereMesh()
-{
-    QNode::cleanup();
-}
-
 void QSphereMesh::setRings(int rings)
 {
     static_cast<QSphereGeometry *>(geometry())->setRings(rings);
diff --git a/src/extras/geometries/qspheremesh.h b/src/extras/geometries/qspheremesh.h
index 7fe346e41..ac13cb563 100644
--- a/src/extras/geometries/qspheremesh.h
+++ b/src/extras/geometries/qspheremesh.h
@@ -59,7 +59,6 @@ class QT3DEXTRASSHARED_EXPORT QSphereMesh : public Qt3DRender::QGeometryRenderer
 
 public:
     explicit QSphereMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QSphereMesh();
 
     int rings() const;
     int slices() const;
diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp
index fe9ac7821..6e5ad8ac8 100644
--- a/src/extras/geometries/qtorusgeometry.cpp
+++ b/src/extras/geometries/qtorusgeometry.cpp
@@ -344,14 +344,6 @@ QTorusGeometry::QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent)
 }
 
 /*!
- * Destroys this geometry.
- */
-QTorusGeometry::~QTorusGeometry()
-{
-    QGeometry::cleanup();
-}
-
-/*!
  * Updates vertices based on rings and slices.
  */
 void QTorusGeometry::updateVertices()
diff --git a/src/extras/geometries/qtorusgeometry.h b/src/extras/geometries/qtorusgeometry.h
index 99b76acd3..46637156d 100644
--- a/src/extras/geometries/qtorusgeometry.h
+++ b/src/extras/geometries/qtorusgeometry.h
@@ -69,7 +69,6 @@ class QT3DEXTRASSHARED_EXPORT QTorusGeometry : public Qt3DRender::QGeometry
 
 public:
     explicit QTorusGeometry(QNode *parent = Q_NULLPTR);
-    ~QTorusGeometry();
 
     void updateVertices();
     void updateIndices();
diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp
index 0f2143835..67f4cffa7 100644
--- a/src/extras/geometries/qtorusmesh.cpp
+++ b/src/extras/geometries/qtorusmesh.cpp
@@ -104,14 +104,6 @@ QTorusMesh::QTorusMesh(QNode *parent)
     QGeometryRenderer::setGeometry(geometry);
 }
 
-/*!
- * Destroys this torus mesh.
- */
-QTorusMesh::~QTorusMesh()
-{
-    QGeometryRenderer::cleanup();
-}
-
 void QTorusMesh::setRings(int rings)
 {
     static_cast<QTorusGeometry *>(geometry())->setRings(rings);
diff --git a/src/extras/geometries/qtorusmesh.h b/src/extras/geometries/qtorusmesh.h
index 16d1be736..064a589ce 100644
--- a/src/extras/geometries/qtorusmesh.h
+++ b/src/extras/geometries/qtorusmesh.h
@@ -56,7 +56,6 @@ class QT3DEXTRASSHARED_EXPORT QTorusMesh : public Qt3DRender::QGeometryRenderer
     Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged)
 public:
     explicit QTorusMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QTorusMesh();
 
     int rings() const;
     int slices() const;
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index 79a72fcf5..8a16bbbc0 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -75,14 +75,6 @@ QAction::QAction(Qt3DCore::QNode *parent)
 }
 
 /*!
-    Deletes the QAction instance.
- */
-QAction::~QAction()
-{
-    QNode::cleanup();
-}
-
-/*!
   \fn QAction::nameChanged()
 
   This signal is emitted when the name of the Action is changed.
diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h
index 211caf4d6..e7643d8d1 100644
--- a/src/input/frontend/qaction.h
+++ b/src/input/frontend/qaction.h
@@ -56,7 +56,6 @@ class QT3DINPUTSHARED_EXPORT QAction : public Qt3DCore::QNode
     Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
 public:
     explicit QAction(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QAction();
 
     bool isActive() const;
 
diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp
index b8c657b35..3e885c209 100644
--- a/src/input/frontend/qactioninput.cpp
+++ b/src/input/frontend/qactioninput.cpp
@@ -90,14 +90,6 @@ QActionInput::QActionInput(Qt3DCore::QNode *parent)
 }
 
 /*!
-    Deletes the QActionInput instance.
- */
-QActionInput::~QActionInput()
-{
-    QNode::cleanup();
-}
-
-/*!
     Return the Buttons to trigger the QActionInput instance.
  */
 QVariantList QActionInput::buttons() const
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index 59b3dcf54..9f89b5f15 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -59,7 +59,6 @@ class QT3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInp
 
 public:
     explicit QActionInput(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QActionInput();
 
     QAbstractPhysicalDevice *sourceDevice() const;
     QVariantList buttons() const;
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index 137119017..767e90e75 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -67,11 +67,6 @@ QAxis::QAxis(Qt3DCore::QNode *parent)
 {
 }
 
-QAxis::~QAxis()
-{
-    QNode::cleanup();
-}
-
 void QAxis::addInput(QAxisInput *input)
 {
     Q_D(QAxis);
diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h
index 39d306843..e84c829b6 100644
--- a/src/input/frontend/qaxis.h
+++ b/src/input/frontend/qaxis.h
@@ -55,7 +55,6 @@ class QT3DINPUTSHARED_EXPORT QAxis : public Qt3DCore::QNode
     Q_PROPERTY(float value READ value NOTIFY valueChanged)
 public:
     explicit QAxis(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QAxis();
 
     void addInput(QAxisInput *input);
     void removeInput(QAxisInput *input);
diff --git a/src/input/frontend/qaxisinput.cpp b/src/input/frontend/qaxisinput.cpp
index 113d9e68e..b1a9b6ec5 100644
--- a/src/input/frontend/qaxisinput.cpp
+++ b/src/input/frontend/qaxisinput.cpp
@@ -67,11 +67,6 @@ QAxisInput::QAxisInput(Qt3DCore::QNode *parent)
 {
 }
 
-QAxisInput::~QAxisInput()
-{
-    QNode::cleanup();
-}
-
 void QAxisInput::setSourceDevice(QAbstractPhysicalDevice *sourceDevice)
 {
     Q_D(QAxisInput);
diff --git a/src/input/frontend/qaxisinput.h b/src/input/frontend/qaxisinput.h
index ff7b55ee0..056af403d 100644
--- a/src/input/frontend/qaxisinput.h
+++ b/src/input/frontend/qaxisinput.h
@@ -61,7 +61,6 @@ class QT3DINPUTSHARED_EXPORT QAxisInput : public Qt3DCore::QNode
 
 public:
     explicit QAxisInput(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QAxisInput();
 
     QAbstractPhysicalDevice *sourceDevice() const;
     float scale() const;
diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp
index 238d35210..2a230e69b 100644
--- a/src/input/frontend/qaxissetting.cpp
+++ b/src/input/frontend/qaxissetting.cpp
@@ -67,11 +67,6 @@ QAxisSetting::QAxisSetting(Qt3DCore::QNode *parent)
 {
 }
 
-QAxisSetting::~QAxisSetting()
-{
-    QNode::cleanup();
-}
-
 QVariantList QAxisSetting::axes() const
 {
     Q_D(const QAxisSetting);
diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h
index 4f2ff29df..b2c591ada 100644
--- a/src/input/frontend/qaxissetting.h
+++ b/src/input/frontend/qaxissetting.h
@@ -60,7 +60,6 @@ class QT3DINPUTSHARED_EXPORT QAxisSetting : public Qt3DCore::QNode
 
 public:
     explicit QAxisSetting(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QAxisSetting();
 
     float deadZoneRadius() const;
     QVariantList axes() const;
diff --git a/src/input/frontend/qgenericinputdevice.cpp b/src/input/frontend/qgenericinputdevice.cpp
index fe8d989cd..8c4b44992 100644
--- a/src/input/frontend/qgenericinputdevice.cpp
+++ b/src/input/frontend/qgenericinputdevice.cpp
@@ -50,11 +50,6 @@ QGenericInputDevice::QGenericInputDevice(Qt3DCore::QNode *parent)
     : QAbstractPhysicalDevice(parent)
 {}
 
-QGenericInputDevice::~QGenericInputDevice()
-{
-    QAbstractPhysicalDevice::cleanup();
-}
-
 static void setHashFromVariantMap(QHash<QString, int> &hash, const QVariantMap &map)
 {
     hash.clear();
diff --git a/src/input/frontend/qgenericinputdevice_p.h b/src/input/frontend/qgenericinputdevice_p.h
index e261b531b..fd2d516d0 100644
--- a/src/input/frontend/qgenericinputdevice_p.h
+++ b/src/input/frontend/qgenericinputdevice_p.h
@@ -65,7 +65,6 @@ class QT3DINPUTSHARED_PRIVATE_EXPORT QGenericInputDevice : public QAbstractPhysi
     Q_PROPERTY(QVariantMap buttonsMap READ buttonsMap WRITE setButtonsMap NOTIFY buttonsMapChanged)
 public:
     QGenericInputDevice(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QGenericInputDevice();
 
     QVariantMap axesMap() const;
     void setAxesMap(const QVariantMap &axesMap);
diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp
index 716806800..e83756499 100644
--- a/src/input/frontend/qinputchord.cpp
+++ b/src/input/frontend/qinputchord.cpp
@@ -98,14 +98,6 @@ QInputChord::QInputChord(Qt3DCore::QNode *parent)
 }
 
 /*!
-    Deletes the QInputChord instance.
- */
-QInputChord::~QInputChord()
-{
-    QNode::cleanup();
-}
-
-/*!
   \fn QInputChord::timeoutChanged()
 
   This signal is emitted when the timeout of the input chord is changed.
diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h
index 1cdce8983..ba86eb896 100644
--- a/src/input/frontend/qinputchord.h
+++ b/src/input/frontend/qinputchord.h
@@ -58,7 +58,6 @@ class QT3DINPUTSHARED_EXPORT QInputChord : public Qt3DInput::QAbstractActionInpu
 
 public:
     explicit QInputChord(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QInputChord();
 
     int timeout() const;
 
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index 0fcc6c263..14f67ca8a 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -95,14 +95,6 @@ QInputSequence::QInputSequence(Qt3DCore::QNode *parent)
 }
 
 /*!
-    Deletes the QInputSequence instance.
- */
-QInputSequence::~QInputSequence()
-{
-    QNode::cleanup();
-}
-
-/*!
   \fn QInputSequence::timeoutChanged()
 
   This signal is emitted when the timeout of the input sequence is changed.
diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h
index ddcf76538..07ca7490c 100644
--- a/src/input/frontend/qinputsequence.h
+++ b/src/input/frontend/qinputsequence.h
@@ -59,7 +59,6 @@ class QT3DINPUTSHARED_EXPORT QInputSequence : public Qt3DInput::QAbstractActionI
 
 public:
     explicit QInputSequence(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QInputSequence();
 
     int timeout() const;
     int buttonInterval() const;
diff --git a/src/input/frontend/qinputsettings.cpp b/src/input/frontend/qinputsettings.cpp
index b3408b325..d696ad894 100644
--- a/src/input/frontend/qinputsettings.cpp
+++ b/src/input/frontend/qinputsettings.cpp
@@ -56,11 +56,6 @@ QInputSettings::QInputSettings(Qt3DCore::QNode *parent)
 {
 }
 
-QInputSettings::~QInputSettings()
-{
-    QComponent::cleanup();
-}
-
 QObject *QInputSettings::eventSource() const
 {
     Q_D(const QInputSettings);
diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h
index 7767deae8..9a5979edb 100644
--- a/src/input/frontend/qinputsettings.h
+++ b/src/input/frontend/qinputsettings.h
@@ -55,7 +55,6 @@ class QT3DINPUTSHARED_EXPORT QInputSettings : public Qt3DCore::QComponent
     Q_PROPERTY(QObject *eventSource READ eventSource WRITE setEventSource NOTIFY eventSourceChanged)
 public:
     explicit QInputSettings(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QInputSettings();
 
     QObject *eventSource() const;
 
diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp
index 20cb45635..7139992f5 100644
--- a/src/input/frontend/qkeyboarddevice.cpp
+++ b/src/input/frontend/qkeyboarddevice.cpp
@@ -220,11 +220,6 @@ QKeyboardDevice::QKeyboardDevice(QNode *parent)
 {
 }
 
-QKeyboardDevice::~QKeyboardDevice()
-{
-    QNode::cleanup();
-}
-
 /*!
     \qmlproperty KeyboardHandler Qt3D.Input::KeyboardDevice::activeInput
     \readonly
diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h
index e34461bd3..6dbe62965 100644
--- a/src/input/frontend/qkeyboarddevice.h
+++ b/src/input/frontend/qkeyboarddevice.h
@@ -58,7 +58,6 @@ class QT3DINPUTSHARED_EXPORT QKeyboardDevice : public Qt3DInput::QAbstractPhysic
 
 public:
     explicit QKeyboardDevice(QNode *parent = 0);
-    ~QKeyboardDevice();
 
     QKeyboardHandler *activeInput() const;
 
diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp
index eee57d1fe..b861298dc 100644
--- a/src/input/frontend/qkeyboardhandler.cpp
+++ b/src/input/frontend/qkeyboardhandler.cpp
@@ -158,11 +158,6 @@ QKeyboardHandler::QKeyboardHandler(QNode *parent)
 {
 }
 
-QKeyboardHandler::~QKeyboardHandler()
-{
-    QNode::cleanup();
-}
-
 void QKeyboardHandler::copy(const QNode *ref)
 {
     QComponent::copy(ref);
diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h
index 6bb195fee..ed253b309 100644
--- a/src/input/frontend/qkeyboardhandler.h
+++ b/src/input/frontend/qkeyboardhandler.h
@@ -58,7 +58,6 @@ class QT3DINPUTSHARED_EXPORT QKeyboardHandler : public Qt3DCore::QComponent
     Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged)
 public:
     explicit QKeyboardHandler(QNode *parent = nullptr);
-    ~QKeyboardHandler();
 
     Qt3DInput::QKeyboardDevice *sourceDevice() const;
     bool focus() const;
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index 4606b1cbe..dd669a9fa 100644
--- a/src/input/frontend/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
@@ -139,14 +139,6 @@ QLogicalDevice::QLogicalDevice(Qt3DCore::QNode *parent)
 }
 
 /*!
-    Deletes the QLogicalDevice instance.
- */
-QLogicalDevice::~QLogicalDevice()
-{
-    QComponent::cleanup();
-}
-
-/*!
   \qmlproperty QQmlListProperty<Action> Qt3D.Input::LogicalDevice::actions
 
   The actions used by this Logical Device
diff --git a/src/input/frontend/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h
index 578786669..f0c7392a1 100644
--- a/src/input/frontend/qlogicaldevice.h
+++ b/src/input/frontend/qlogicaldevice.h
@@ -56,7 +56,6 @@ class QT3DINPUTSHARED_EXPORT QLogicalDevice : public Qt3DCore::QComponent
     Q_OBJECT
 public:
     explicit QLogicalDevice(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QLogicalDevice();
 
     void addAction(QAction *action);
     void removeAction(QAction *action);
diff --git a/src/input/frontend/qmousedevice.cpp b/src/input/frontend/qmousedevice.cpp
index a483ee842..3def81185 100644
--- a/src/input/frontend/qmousedevice.cpp
+++ b/src/input/frontend/qmousedevice.cpp
@@ -76,14 +76,6 @@ QMouseDevice::QMouseDevice(QNode *parent)
 {
 }
 
-/*!
-   Destroys this QMouseDevice object.
-*/
-QMouseDevice::~QMouseDevice()
-{
-    QNode::cleanup();
-}
-
 int QMouseDevice::axisCount() const
 {
     // TO DO: we could have mouse wheel later on
diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h
index 15a82acab..32a9d87a9 100644
--- a/src/input/frontend/qmousedevice.h
+++ b/src/input/frontend/qmousedevice.h
@@ -59,7 +59,6 @@ class QT3DINPUTSHARED_EXPORT QMouseDevice : public Qt3DInput::QAbstractPhysicalD
     Q_PROPERTY(float sensitivity READ sensitivity WRITE setSensitivity NOTIFY sensitivityChanged)
 public:
     explicit QMouseDevice(Qt3DCore::QNode *parent = nullptr);
-    ~QMouseDevice();
 
     enum Axis {
         X,
diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index 5a592d8a5..88d12feee 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -119,14 +119,6 @@ QMouseHandler::QMouseHandler(QNode *parent)
 }
 
 /*!
-   Destroys this QMouseHandler object
-*/
-QMouseHandler::~QMouseHandler()
-{
-    QNode::cleanup();
-}
-
-/*!
  * Sets the mouse device of the QMouseHandler instance to \a mouseDevice.
  */
 void QMouseHandler::setSourceDevice(QMouseDevice *mouseDevice)
diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h
index d837268e8..deca370b4 100644
--- a/src/input/frontend/qmousehandler.h
+++ b/src/input/frontend/qmousehandler.h
@@ -59,7 +59,6 @@ class QT3DINPUTSHARED_EXPORT QMouseHandler : public Qt3DCore::QComponent
 
 public:
     explicit QMouseHandler(QNode *parent = nullptr);
-    ~QMouseHandler();
 
     QMouseDevice *sourceDevice() const;
     bool containsMouse() const;
diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp
index bc7094205..4ff540e21 100644
--- a/src/logic/qframeaction.cpp
+++ b/src/logic/qframeaction.cpp
@@ -89,11 +89,6 @@ QFrameAction::QFrameAction(QFrameActionPrivate &dd, QNode *parent)
 {
 }
 
-QFrameAction::~QFrameAction()
-{
-    QNode::cleanup();
-}
-
 /*!
     \internal
     This function will be called in a synchronous manner once each frame by
diff --git a/src/logic/qframeaction.h b/src/logic/qframeaction.h
index 7a869a5f6..9000c916e 100644
--- a/src/logic/qframeaction.h
+++ b/src/logic/qframeaction.h
@@ -60,7 +60,6 @@ class QT3DLOGICSHARED_EXPORT QFrameAction : public Qt3DCore::QComponent
 
 public:
     explicit QFrameAction(Qt3DCore::QNode *parent = nullptr);
-    ~QFrameAction();
 
 protected:
     QFrameAction(QFrameActionPrivate &dd, QNode *parent = nullptr);
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index eb403ff6d..0e72cba6b 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -100,11 +100,6 @@ Quick3DEntityLoader::Quick3DEntityLoader(QNode *parent)
 {
 }
 
-Quick3DEntityLoader::~Quick3DEntityLoader()
-{
-    QNode::cleanup();
-}
-
 /*!
     \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 e83c29884..fe470653f 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -76,7 +76,6 @@ 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;
 
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index 32a82ad98..aff179f17 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -244,11 +244,6 @@ Quick3DNodeInstantiator::Quick3DNodeInstantiator(QNode *parent)
 {
 }
 
-Quick3DNodeInstantiator::~Quick3DNodeInstantiator()
-{
-    QNode::cleanup();
-}
-
 /*!
     \qmlsignal Qt3D.Core::NodeInstantiator::objectAdded(int index, QtObject node)
 
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
index 9485b5bbd..d1fc88147 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
@@ -80,7 +80,6 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DNodeInstantiator : public QNode, pub
 
 public:
     Quick3DNodeInstantiator(QNode *parent = 0);
-    ~Quick3DNodeInstantiator();
 
     bool isActive() const;
     void setActive(bool newVal);
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 4ec789315..f9522f87d 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
@@ -61,11 +61,6 @@ Quick3DShaderDataArray::Quick3DShaderDataArray(QNode *parent)
 {
 }
 
-Quick3DShaderDataArray::~Quick3DShaderDataArray()
-{
-    QNode::cleanup();
-}
-
 QQmlListProperty<QShaderData> Quick3DShaderDataArray::valuesList()
 {
     return QQmlListProperty<QShaderData>(this, 0,
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
index 0269fd3fc..7f68e1456 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
@@ -76,7 +76,6 @@ class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderDataArray : public Qt3DC
 
 public:
     explicit Quick3DShaderDataArray(Qt3DCore::QNode *parent = 0);
-    ~Quick3DShaderDataArray();
     QQmlListProperty<QShaderData> valuesList();
     QVector<QShaderData *> values() const;
 
diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp
index f8341304d..81a5ea8ad 100644
--- a/src/render/framegraph/qcameraselector.cpp
+++ b/src/render/framegraph/qcameraselector.cpp
@@ -76,11 +76,6 @@ QCameraSelector::QCameraSelector(Qt3DCore::QNode *parent)
     :   QFrameGraphNode(*new QCameraSelectorPrivate, parent)
 {}
 
-QCameraSelector::~QCameraSelector()
-{
-    QNode::cleanup();
-}
-
 /*!
     \property Qt3DRender::QCameraSelector::camera
 */
diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h
index 34957e5f2..9e9e9ba55 100644
--- a/src/render/framegraph/qcameraselector.h
+++ b/src/render/framegraph/qcameraselector.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QCameraSelector : public QFrameGraphNode
 
 public:
     explicit QCameraSelector(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QCameraSelector();
 
     Qt3DCore::QEntity *camera() const;
 
diff --git a/src/render/framegraph/qclearbuffers.cpp b/src/render/framegraph/qclearbuffers.cpp
index e89436c3f..3fbce4016 100644
--- a/src/render/framegraph/qclearbuffers.cpp
+++ b/src/render/framegraph/qclearbuffers.cpp
@@ -68,11 +68,6 @@ QClearBuffers::QClearBuffers(QNode *parent)
 {
 }
 
-QClearBuffers::~QClearBuffers()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QClearBuffers::QClearBuffers(QClearBuffersPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
diff --git a/src/render/framegraph/qclearbuffers.h b/src/render/framegraph/qclearbuffers.h
index 9ac3a0c03..ca1385398 100644
--- a/src/render/framegraph/qclearbuffers.h
+++ b/src/render/framegraph/qclearbuffers.h
@@ -59,7 +59,6 @@ class QT3DRENDERSHARED_EXPORT QClearBuffers : public QFrameGraphNode
     Q_PROPERTY(int clearStencilValue READ clearStencilValue WRITE setClearStencilValue NOTIFY clearStencilValueChanged)
 public:
     explicit QClearBuffers(Qt3DCore::QNode *parent = 0);
-    ~QClearBuffers();
 
     enum BufferType {
         None = 0,
diff --git a/src/render/framegraph/qdispatchcompute.cpp b/src/render/framegraph/qdispatchcompute.cpp
index 7e230df35..1d9b72ac1 100644
--- a/src/render/framegraph/qdispatchcompute.cpp
+++ b/src/render/framegraph/qdispatchcompute.cpp
@@ -49,11 +49,6 @@ QDispatchCompute::QDispatchCompute(Qt3DCore::QNode *parent)
 {
 }
 
-QDispatchCompute::~QDispatchCompute()
-{
-    QFrameGraphNode::cleanup();
-}
-
 int QDispatchCompute::workGroupX() const
 {
     Q_D(const QDispatchCompute);
diff --git a/src/render/framegraph/qdispatchcompute.h b/src/render/framegraph/qdispatchcompute.h
index f4797e527..7884b80e6 100644
--- a/src/render/framegraph/qdispatchcompute.h
+++ b/src/render/framegraph/qdispatchcompute.h
@@ -57,7 +57,6 @@ class QT3DRENDERSHARED_EXPORT QDispatchCompute : public QFrameGraphNode
     Q_PROPERTY(int workGroupZ READ workGroupZ WRITE setWorkGroupZ NOTIFY workGroupZChanged)
 public:
     explicit QDispatchCompute(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QDispatchCompute();
 
     int workGroupX() const;
     int workGroupY() const;
diff --git a/src/render/framegraph/qfrustumculling.cpp b/src/render/framegraph/qfrustumculling.cpp
index 6468cd5ab..47ce74b97 100644
--- a/src/render/framegraph/qfrustumculling.cpp
+++ b/src/render/framegraph/qfrustumculling.cpp
@@ -48,11 +48,6 @@ QFrustumCulling::QFrustumCulling(Qt3DCore::QNode *parent)
 {
 }
 
-QFrustumCulling::~QFrustumCulling()
-{
-    QFrameGraphNode::cleanup();
-}
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qfrustumculling.h b/src/render/framegraph/qfrustumculling.h
index a014b308c..16874f941 100644
--- a/src/render/framegraph/qfrustumculling.h
+++ b/src/render/framegraph/qfrustumculling.h
@@ -51,7 +51,6 @@ class QT3DRENDERSHARED_EXPORT QFrustumCulling : public QFrameGraphNode
     Q_OBJECT
 public:
     explicit QFrustumCulling(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QFrustumCulling();
 
 private:
     QT3D_CLONEABLE(QFrustumCulling)
diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp
index eeeb3d2bb..2322bd391 100644
--- a/src/render/framegraph/qlayerfilter.cpp
+++ b/src/render/framegraph/qlayerfilter.cpp
@@ -85,11 +85,6 @@ QLayerFilter::QLayerFilter(QNode *parent)
 {
 }
 
-QLayerFilter::~QLayerFilter()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h
index 470b74a45..c1da1c9cb 100644
--- a/src/render/framegraph/qlayerfilter.h
+++ b/src/render/framegraph/qlayerfilter.h
@@ -55,7 +55,6 @@ class QT3DRENDERSHARED_EXPORT QLayerFilter : public QFrameGraphNode
     Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged)
 public:
     explicit QLayerFilter(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QLayerFilter();
 
     QStringList layers() const;
 
diff --git a/src/render/framegraph/qnodraw.cpp b/src/render/framegraph/qnodraw.cpp
index eb100418f..122c828f2 100644
--- a/src/render/framegraph/qnodraw.cpp
+++ b/src/render/framegraph/qnodraw.cpp
@@ -64,11 +64,6 @@ QNoDraw::QNoDraw(QNode *parent)
 {
 }
 
-QNoDraw::~QNoDraw()
-{
-    QNode::cleanup();
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h
index fbe401103..c776f92b1 100644
--- a/src/render/framegraph/qnodraw.h
+++ b/src/render/framegraph/qnodraw.h
@@ -51,7 +51,6 @@ class QT3DRENDERSHARED_EXPORT QNoDraw : public QFrameGraphNode
     Q_OBJECT
 public:
     explicit QNoDraw(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QNoDraw();
 
 private:
     QT3D_CLONEABLE(QNoDraw)
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 5df3b638d..360e69e99 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -55,11 +55,6 @@ QRenderPassFilter::QRenderPassFilter(QNode *parent)
     : QFrameGraphNode(*new QRenderPassFilterPrivate, parent)
 {}
 
-QRenderPassFilter::~QRenderPassFilter()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index 51d9ba216..68d73929c 100644
--- a/src/render/framegraph/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
@@ -59,7 +59,6 @@ class QT3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode
 
 public:
     explicit QRenderPassFilter(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QRenderPassFilter();
 
     QVector<QFilterKey*> matchAny() const;
     void addMatch(QFilterKey*keyFilter);
diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index e82446dc1..17b3893e3 100644
--- a/src/render/framegraph/qrenderstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -83,11 +83,6 @@ QRenderStateSet::QRenderStateSet(QRenderStateSetPrivate &dd, QNode *parent)
 {
 }
 
-QRenderStateSet::~QRenderStateSet()
-{
-    QNode::cleanup();
-}
-
 void QRenderStateSet::copy(const QNode *ref)
 {
     QFrameGraphNode::copy(ref);
diff --git a/src/render/framegraph/qrenderstateset.h b/src/render/framegraph/qrenderstateset.h
index 92819dfa6..d5d657aba 100644
--- a/src/render/framegraph/qrenderstateset.h
+++ b/src/render/framegraph/qrenderstateset.h
@@ -55,7 +55,6 @@ class QT3DRENDERSHARED_EXPORT QRenderStateSet : public QFrameGraphNode
 
 public:
     explicit QRenderStateSet(Qt3DCore::QNode *parent = 0);
-    ~QRenderStateSet();
 
     void addRenderState(QRenderState *state);
     void removeRenderState(QRenderState *state);
diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp
index 44902f317..37fa26e72 100644
--- a/src/render/framegraph/qrendersurfaceselector.cpp
+++ b/src/render/framegraph/qrendersurfaceselector.cpp
@@ -111,14 +111,6 @@ QRenderSurfaceSelector::QRenderSurfaceSelector(QRenderSurfaceSelectorPrivate &dd
 {
 }
 
-/*!
- * Destroys QRenderSurfaceSelector.
- */
-QRenderSurfaceSelector::~QRenderSurfaceSelector()
-{
-    QNode::cleanup();
-}
-
 QObject *QRenderSurfaceSelector::surface() const
 {
     Q_D(const QRenderSurfaceSelector);
diff --git a/src/render/framegraph/qrendersurfaceselector.h b/src/render/framegraph/qrendersurfaceselector.h
index 12327111a..ee7ec98b1 100644
--- a/src/render/framegraph/qrendersurfaceselector.h
+++ b/src/render/framegraph/qrendersurfaceselector.h
@@ -61,7 +61,6 @@ class QT3DRENDERSHARED_EXPORT QRenderSurfaceSelector : public Qt3DRender::QFrame
 
 public:
     explicit QRenderSurfaceSelector(Qt3DCore::QNode *parent = nullptr);
-    ~QRenderSurfaceSelector();
 
     QObject *surface() const;
     QSize externalRenderTargetSize() const;
diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index 33d8070a9..0cbe701be 100644
--- a/src/render/framegraph/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
@@ -71,11 +71,6 @@ QRenderTargetSelector::QRenderTargetSelector(QNode *parent)
 {
 }
 
-QRenderTargetSelector::~QRenderTargetSelector()
-{
-    QNode::cleanup();
-}
-
 void QRenderTargetSelector::setTarget(QRenderTarget *target)
 {
     Q_D(QRenderTargetSelector);
diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index 8f2c6cdad..7495ffe20 100644
--- a/src/render/framegraph/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
@@ -58,7 +58,6 @@ class QT3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode
     Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged)
 public:
     explicit QRenderTargetSelector(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QRenderTargetSelector();
 
     QRenderTarget *target() const;
 
diff --git a/src/render/framegraph/qsortcriterion.cpp b/src/render/framegraph/qsortcriterion.cpp
index cc5d38769..926f80621 100644
--- a/src/render/framegraph/qsortcriterion.cpp
+++ b/src/render/framegraph/qsortcriterion.cpp
@@ -63,11 +63,6 @@ QSortCriterion::QSortCriterion(QNode *parent)
 {
 }
 
-QSortCriterion::~QSortCriterion()
-{
-    QNode::cleanup();
-}
-
 QSortCriterion::SortType QSortCriterion::sort() const
 {
     Q_D(const QSortCriterion);
diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h
index 68f480b38..79bfc7187 100644
--- a/src/render/framegraph/qsortcriterion.h
+++ b/src/render/framegraph/qsortcriterion.h
@@ -55,7 +55,6 @@ class QT3DRENDERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode
     Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged)
 public:
     explicit QSortCriterion(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QSortCriterion();
 
     enum SortType {
         StateChangeCost = (1 << 0),
diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp
index c9509adfd..51e33b036 100644
--- a/src/render/framegraph/qsortpolicy.cpp
+++ b/src/render/framegraph/qsortpolicy.cpp
@@ -67,11 +67,6 @@ QSortPolicy::QSortPolicy(QNode *parent)
 {
 }
 
-QSortPolicy::~QSortPolicy()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QSortPolicy::QSortPolicy(QSortPolicyPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h
index ad51e043a..f330867d3 100644
--- a/src/render/framegraph/qsortpolicy.h
+++ b/src/render/framegraph/qsortpolicy.h
@@ -55,7 +55,6 @@ class QT3DRENDERSHARED_EXPORT QSortPolicy : public QFrameGraphNode
 
 public:
     explicit QSortPolicy(Qt3DCore::QNode *parent = 0);
-    ~QSortPolicy();
 
     void addCriterion(QSortCriterion *criterion);
     void removeCriterion(QSortCriterion *criterion);
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 95aa70ef3..cb814124e 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -71,11 +71,6 @@ QTechniqueFilter::QTechniqueFilter(QNode *parent)
 {
 }
 
-QTechniqueFilter::~QTechniqueFilter()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h
index 52bea3ffa..05de15f0a 100644
--- a/src/render/framegraph/qtechniquefilter.h
+++ b/src/render/framegraph/qtechniquefilter.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode
     Q_OBJECT
 public:
     explicit QTechniqueFilter(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QTechniqueFilter();
 
     QVector<QFilterKey*> criteria() const;
     void addMatch(QFilterKey*criterion);
diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp
index a3b113522..43562caa5 100644
--- a/src/render/framegraph/qviewport.cpp
+++ b/src/render/framegraph/qviewport.cpp
@@ -64,11 +64,6 @@ QViewport::QViewport(QNode *parent)
 {
 }
 
-QViewport::~QViewport()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QViewport::QViewport(QViewportPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h
index 85ef65a9c..8489b2462 100644
--- a/src/render/framegraph/qviewport.h
+++ b/src/render/framegraph/qviewport.h
@@ -57,7 +57,6 @@ class QT3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode
 
 public:
     explicit QViewport(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QViewport();
 
     QRectF normalizedRect() const;
 
diff --git a/src/render/frontend/qcamera.cpp b/src/render/frontend/qcamera.cpp
index fb1122c0b..eac334240 100644
--- a/src/render/frontend/qcamera.cpp
+++ b/src/render/frontend/qcamera.cpp
@@ -86,11 +86,6 @@ QCamera::QCamera(Qt3DCore::QNode *parent)
     addComponent(d_func()->m_transform);
 }
 
-QCamera::~QCamera()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QCamera::QCamera(QCameraPrivate &dd, Qt3DCore::QNode *parent)
     : Qt3DCore::QEntity(dd, parent)
diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h
index 809cc8833..3b82b5a71 100644
--- a/src/render/frontend/qcamera.h
+++ b/src/render/frontend/qcamera.h
@@ -81,7 +81,6 @@ class QT3DRENDERSHARED_EXPORT QCamera : public Qt3DCore::QEntity
 
 public:
     explicit QCamera(QNode *parent = Q_NULLPTR);
-    ~QCamera();
 
     enum CameraTranslationOption {
         TranslateViewCenter,
diff --git a/src/render/frontend/qcameralens.cpp b/src/render/frontend/qcameralens.cpp
index 7d619d9ae..e36fae063 100644
--- a/src/render/frontend/qcameralens.cpp
+++ b/src/render/frontend/qcameralens.cpp
@@ -68,11 +68,6 @@ QCameraLens::QCameraLens(QNode *parent)
     d->updateProjectionMatrix();
 }
 
-QCameraLens::~QCameraLens()
-{
-    QNode::cleanup();
-}
-
 void QCameraLens::copy(const QNode *ref)
 {
     QComponent::copy(ref);
diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h
index 7788d72e4..7fba4ac43 100644
--- a/src/render/frontend/qcameralens.h
+++ b/src/render/frontend/qcameralens.h
@@ -69,7 +69,6 @@ class QT3DRENDERSHARED_EXPORT QCameraLens : public Qt3DCore::QComponent
 
 public:
     explicit QCameraLens(QNode *parent = Q_NULLPTR);
-    ~QCameraLens();
 
     enum ProjectionType {
         OrthographicProjection,
diff --git a/src/render/frontend/qcomputecommand.cpp b/src/render/frontend/qcomputecommand.cpp
index 0e7421658..3a4b67111 100644
--- a/src/render/frontend/qcomputecommand.cpp
+++ b/src/render/frontend/qcomputecommand.cpp
@@ -57,11 +57,6 @@ QComputeCommand::QComputeCommand(Qt3DCore::QNode *parent)
 {
 }
 
-QComputeCommand::~QComputeCommand()
-{
-    QComponent::cleanup();
-}
-
 int QComputeCommand::workGroupX() const
 {
     Q_D(const QComputeCommand);
diff --git a/src/render/frontend/qcomputecommand.h b/src/render/frontend/qcomputecommand.h
index 5effc81ac..04699ac7a 100644
--- a/src/render/frontend/qcomputecommand.h
+++ b/src/render/frontend/qcomputecommand.h
@@ -59,7 +59,6 @@ class QT3DRENDERSHARED_EXPORT QComputeCommand : public Qt3DCore::QComponent
 public:
 
     explicit QComputeCommand(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QComputeCommand();
 
     int workGroupX() const;
     int workGroupY() const;
diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp
index 34bfdbddc..8ecf46b1e 100644
--- a/src/render/frontend/qlayer.cpp
+++ b/src/render/frontend/qlayer.cpp
@@ -85,11 +85,6 @@ QLayer::QLayer(QNode *parent)
 {
 }
 
-QLayer::~QLayer()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QLayer::QLayer(QLayerPrivate &dd, QNode *parent)
     : QComponent(dd, parent)
diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h
index 72b34fc50..13037d711 100644
--- a/src/render/frontend/qlayer.h
+++ b/src/render/frontend/qlayer.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent
     Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged)
 public:
     explicit QLayer(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QLayer();
 
     QStringList names() const;
 
diff --git a/src/render/frontend/qpickingsettings.cpp b/src/render/frontend/qpickingsettings.cpp
index 051dbf082..705cf150e 100644
--- a/src/render/frontend/qpickingsettings.cpp
+++ b/src/render/frontend/qpickingsettings.cpp
@@ -61,11 +61,6 @@ QPickingSettings::QPickingSettings(QPickingSettingsPrivate &dd, Qt3DCore::QNode
 {
 }
 
-QPickingSettings::~QPickingSettings()
-{
-    QNode::cleanup();
-}
-
 QPickingSettings::PickMethod QPickingSettings::pickMethod() const
 {
     Q_D(const QPickingSettings);
diff --git a/src/render/frontend/qpickingsettings.h b/src/render/frontend/qpickingsettings.h
index b6ba5a0ca..c87127e3c 100644
--- a/src/render/frontend/qpickingsettings.h
+++ b/src/render/frontend/qpickingsettings.h
@@ -57,7 +57,6 @@ class QT3DRENDERSHARED_EXPORT QPickingSettings : public Qt3DCore::QNode
 
 public:
     explicit QPickingSettings(Qt3DCore::QNode *parent = nullptr);
-    ~QPickingSettings();
 
     enum PickMethod {
         BoundingVolumePicking,
diff --git a/src/render/frontend/qrendersettings.cpp b/src/render/frontend/qrendersettings.cpp
index c9343fc1b..9d360e9fa 100644
--- a/src/render/frontend/qrendersettings.cpp
+++ b/src/render/frontend/qrendersettings.cpp
@@ -85,11 +85,6 @@ QRenderSettings::QRenderSettings(QRenderSettingsPrivate &dd, Qt3DCore::QNode *pa
     d->init();
 }
 
-QRenderSettings::~QRenderSettings()
-{
-    QNode::cleanup();
-}
-
 QPickingSettings *QRenderSettings::pickingSettings()
 {
     Q_D(QRenderSettings);
diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h
index 4f990b410..862d91e6b 100644
--- a/src/render/frontend/qrendersettings.h
+++ b/src/render/frontend/qrendersettings.h
@@ -62,7 +62,6 @@ class QT3DRENDERSHARED_EXPORT QRenderSettings : public Qt3DCore::QComponent
 
 public:
     explicit QRenderSettings(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QRenderSettings();
 
     enum RenderPolicy {
         OnDemand,
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index 2257e9043..a166901f8 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -66,11 +66,6 @@ QRenderTarget::QRenderTarget(QNode *parent)
 {
 }
 
-QRenderTarget::~QRenderTarget()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QRenderTarget::QRenderTarget(QRenderTargetPrivate &dd, QNode *parent)
     : QComponent(dd, parent)
diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h
index f58274f04..ac011103b 100644
--- a/src/render/frontend/qrendertarget.h
+++ b/src/render/frontend/qrendertarget.h
@@ -55,7 +55,6 @@ class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent
     Q_OBJECT
 public:
     explicit QRenderTarget(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QRenderTarget();
 
     void addOutput(QRenderTargetOutput *output);
     void removeOutput(QRenderTargetOutput *output);
diff --git a/src/render/frontend/qrendertargetoutput.cpp b/src/render/frontend/qrendertargetoutput.cpp
index 4d9d4e36c..8a4cb0494 100644
--- a/src/render/frontend/qrendertargetoutput.cpp
+++ b/src/render/frontend/qrendertargetoutput.cpp
@@ -68,11 +68,6 @@ QRenderTargetOutput::QRenderTargetOutput(QNode *parent)
 {
 }
 
-QRenderTargetOutput::~QRenderTargetOutput()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QRenderTargetOutput::QRenderTargetOutput(QRenderTargetOutputPrivate &dd, QNode *parent)
     : QNode(dd, parent)
diff --git a/src/render/frontend/qrendertargetoutput.h b/src/render/frontend/qrendertargetoutput.h
index 54da3320b..947d65085 100644
--- a/src/render/frontend/qrendertargetoutput.h
+++ b/src/render/frontend/qrendertargetoutput.h
@@ -85,7 +85,6 @@ public:
     Q_ENUM(AttachmentPoint)
 
     explicit QRenderTargetOutput(Qt3DCore::QNode *parent = 0);
-    ~QRenderTargetOutput();
 
     AttachmentPoint attachmentPoint() const;
     QAbstractTexture *texture() const;
diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp
index d9467dd82..1d17b4bc9 100644
--- a/src/render/geometry/qattribute.cpp
+++ b/src/render/geometry/qattribute.cpp
@@ -115,14 +115,6 @@ QAttribute::QAttribute(QNode *parent)
 }
 
 /*!
- * Destroys the  attribute.
- */
-QAttribute::~QAttribute()
-{
-    QNode::cleanup();
-}
-
-/*!
  * Constructs a new QAttribute from \a buf of \a type, \a dataSize, \a count, \a offset,
  * and \a stride with \a parent.
  */
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index 99da0f1d4..0252d7de5 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -41,7 +41,7 @@
 #define QT3DRENDER_QATTRIBUTE_H
 
 #include <Qt3DRender/qt3drender_global.h>
-#include <Qt3DCore/QNode>
+#include <Qt3DCore/qnode.h>
 #include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
@@ -90,7 +90,6 @@ public:
     explicit QAttribute(QNode *parent = nullptr);
     explicit QAttribute(QBuffer *buf, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr);
     explicit QAttribute(QBuffer *buf, const QString &name, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr);
-    ~QAttribute();
 
     QBuffer *buffer() const;
     QString name() const;
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index b5a0b99a0..1c7914fe2 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -154,14 +154,6 @@ QBuffer::QBuffer(QBuffer::BufferType ty, QNode *parent)
 }
 
 /*!
- * Destroys this buffer.
- */
-QBuffer::~QBuffer()
-{
-    QBuffer::cleanup();
-}
-
-/*!
  * \internal
  */
 void QBuffer::copy(const QNode *ref)
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index ebb2d9a55..b9ee3e5c8 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -86,7 +86,6 @@ public:
     Q_ENUM(UsageType)
 
     explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QBuffer();
 
     UsageType usage() const;
     BufferType type() const;
diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index 514003211..834d961ba 100644
--- a/src/render/geometry/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
@@ -93,14 +93,6 @@ QGeometry::QGeometry(QGeometryPrivate &dd, QNode *parent)
 }
 
 /*!
- * Destroys this geometry.
- */
-QGeometry::~QGeometry()
-{
-    QNode::cleanup();
-}
-
-/*!
  * Adds an \a attribute to this geometry.
  */
 void QGeometry::addAttribute(QAttribute *attribute)
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index b392d7866..f35d362a4 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
     Q_PROPERTY(Qt3DRender::QAttribute *boundingVolumePositionAttribute READ boundingVolumePositionAttribute WRITE setBoundingVolumePositionAttribute NOTIFY boundingVolumePositionAttributeChanged)
 public:
     explicit QGeometry(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QGeometry();
 
     QVector<QAttribute *> attributes() const;
     void addAttribute(QAttribute *attribute);
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index 35146974d..1dc654aa6 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -159,14 +159,6 @@ QGeometryRenderer::QGeometryRenderer(QNode *parent)
 }
 
 /*!
- * Destroys this geometry renderer.
- */
-QGeometryRenderer::~QGeometryRenderer()
-{
-    QComponent::cleanup();
-}
-
-/*!
  * \internal
  */
 QGeometryRenderer::QGeometryRenderer(QGeometryRendererPrivate &dd, QNode *parent)
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 8a2e85459..6aab5a1c2 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -68,7 +68,6 @@ class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
 
 public:
     explicit QGeometryRenderer(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QGeometryRenderer();
 
     enum PrimitiveType {
         Points = 0x0000,
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index ef9a793f9..72a0a13b6 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -107,14 +107,6 @@ QMesh::QMesh(QNode *parent)
 {
 }
 
-/*!
- * Destroys this mesh.
- */
-QMesh::~QMesh()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QMesh::QMesh(QMeshPrivate &dd, QNode *parent)
     : QGeometryRenderer(dd, parent)
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index 36778f6ad..8b353a4ab 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -62,7 +62,6 @@ class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer
 
 public:
     explicit QMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QMesh();
 
     QUrl source() const;
     QString meshName() const;
diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp
index 3b5db6a7a..09ce56f47 100644
--- a/src/render/io/qsceneloader.cpp
+++ b/src/render/io/qsceneloader.cpp
@@ -70,11 +70,6 @@ QSceneLoader::QSceneLoader(QSceneLoaderPrivate &dd, QNode *parent)
 {
 }
 
-QSceneLoader::~QSceneLoader()
-{
-    QNode::cleanup();
-}
-
 // Called in main thread
 void QSceneLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
 {
diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h
index 96aade339..d93410c4a 100644
--- a/src/render/io/qsceneloader.h
+++ b/src/render/io/qsceneloader.h
@@ -58,7 +58,6 @@ class QT3DRENDERSHARED_EXPORT QSceneLoader : public Qt3DCore::QComponent
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 public:
     explicit QSceneLoader(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QSceneLoader();
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
     enum Status {
diff --git a/src/render/lights/qlight.cpp b/src/render/lights/qlight.cpp
index cd68d843c..f86e709e4 100644
--- a/src/render/lights/qlight.cpp
+++ b/src/render/lights/qlight.cpp
@@ -89,11 +89,6 @@ QLight::QLight(QLightPrivate &dd, QNode *parent)
 {
 }
 
-QLight::~QLight()
-{
-    cleanup();
-}
-
 QLight::Type QLight::type() const
 {
     Q_D(const QLight);
diff --git a/src/render/lights/qlight.h b/src/render/lights/qlight.h
index 45c51aa66..369d35526 100644
--- a/src/render/lights/qlight.h
+++ b/src/render/lights/qlight.h
@@ -68,7 +68,6 @@ public :
     Q_ENUM(Type)
 
     explicit QLight(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QLight();
 
     Type type() const;
     QColor color() const;
diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 89c356bad..27a39a619 100644
--- a/src/render/materialsystem/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
@@ -60,11 +60,6 @@ QEffect::QEffect(QNode *parent)
 {
 }
 
-QEffect::~QEffect()
-{
-    QNode::cleanup();
-}
-
 void QEffect::copy(const QNode* ref)
 {
     QNode::copy(ref);
diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h
index 647542c85..54e18454c 100644
--- a/src/render/materialsystem/qeffect.h
+++ b/src/render/materialsystem/qeffect.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QEffect : public Qt3DCore::QNode
     Q_OBJECT
 public:
     explicit QEffect(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QEffect();
 
     void addParameter(QParameter *parameter);
     void removeParameter(QParameter *parameter);
diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp
index 5f947ca3a..332000db2 100644
--- a/src/render/materialsystem/qfilterkey.cpp
+++ b/src/render/materialsystem/qfilterkey.cpp
@@ -87,11 +87,6 @@ QFilterKey::QFilterKey(QNode *parent)
 {
 }
 
-QFilterKey::~QFilterKey()
-{
-    QNode::cleanup();
-}
-
 void QFilterKey::setValue(const QVariant &value)
 {
     Q_D(QFilterKey);
diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h
index df4cdeedc..5bcd81a11 100644
--- a/src/render/materialsystem/qfilterkey.h
+++ b/src/render/materialsystem/qfilterkey.h
@@ -57,7 +57,6 @@ class QT3DRENDERSHARED_EXPORT QFilterKey : public Qt3DCore::QNode
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 public:
     explicit QFilterKey(Qt3DCore::QNode *parent = nullptr);
-    ~QFilterKey();
 
     QVariant value() const;
     QString name() const;
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index 4f2baeeba..a9a6eabc0 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -100,11 +100,6 @@ QMaterial::QMaterial(QNode *parent)
 {
 }
 
-QMaterial::~QMaterial()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QMaterial::QMaterial(QMaterialPrivate &dd, QNode *parent)
     : QComponent(dd, parent)
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h
index eadc4a0c9..b97f11b90 100644
--- a/src/render/materialsystem/qmaterial.h
+++ b/src/render/materialsystem/qmaterial.h
@@ -61,7 +61,6 @@ class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent
 
 public:
     explicit QMaterial(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QMaterial();
 
     QEffect *effect() const;
 
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index a0064cf69..ba4eb5895 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -84,11 +84,6 @@ QParameter::QParameter(QNode *parent)
 {
 }
 
-QParameter::~QParameter()
-{
-    QNode::cleanup();
-}
-
 QParameter::QParameter(const QString &name, const QVariant &value, QNode *parent)
     : QNode(*new QParameterPrivate, parent)
 {
diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h
index 717b9bc0f..1ec5bc556 100644
--- a/src/render/materialsystem/qparameter.h
+++ b/src/render/materialsystem/qparameter.h
@@ -59,8 +59,6 @@ class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode
 
 public:
     explicit QParameter(Qt3DCore::QNode *parent = nullptr);
-    ~QParameter();
-
     QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = nullptr);
     QParameter(const QString &name, QAbstractTexture *texture, Qt3DCore::QNode *parent = nullptr);
 
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index 3e97c9a8e..66b39455e 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -77,11 +77,6 @@ QRenderPass::QRenderPass(QNode *parent)
 {
 }
 
-QRenderPass::~QRenderPass()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QRenderPass::QRenderPass(QRenderPassPrivate &dd, QNode *parent)
     : QNode(dd, parent)
diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h
index 143121e7f..971f01eee 100644
--- a/src/render/materialsystem/qrenderpass.h
+++ b/src/render/materialsystem/qrenderpass.h
@@ -66,7 +66,6 @@ class QT3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode
 
 public:
     explicit QRenderPass(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QRenderPass();
 
     QShaderProgram *shaderProgram() const;
 
diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp
index d9d38252d..74f45bb09 100644
--- a/src/render/materialsystem/qshaderdata.cpp
+++ b/src/render/materialsystem/qshaderdata.cpp
@@ -76,11 +76,6 @@ QShaderData::QShaderData(QNode *parent)
 {
 }
 
-QShaderData::~QShaderData()
-{
-    QNode::cleanup();
-}
-
 PropertyReaderInterfacePtr QShaderData::propertyReader() const
 {
     Q_D(const QShaderData);
diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h
index cc03aee03..08b20f5cd 100644
--- a/src/render/materialsystem/qshaderdata.h
+++ b/src/render/materialsystem/qshaderdata.h
@@ -64,7 +64,6 @@ class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent
     Q_OBJECT
 public:
     explicit QShaderData(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QShaderData();
 
     enum TransformType {
         ModelToEye = 0,
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index 618dd45cc..612e89bdd 100644
--- a/src/render/materialsystem/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
@@ -73,11 +73,6 @@ QShaderProgram::QShaderProgram(QNode *parent)
 {
 }
 
-QShaderProgram::~QShaderProgram()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QShaderProgram::QShaderProgram(QShaderProgramPrivate &dd, QNode *parent)
     : QNode(dd, parent)
diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h
index ce200abbe..3e88c1f4c 100644
--- a/src/render/materialsystem/qshaderprogram.h
+++ b/src/render/materialsystem/qshaderprogram.h
@@ -61,7 +61,6 @@ class QT3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode
 
 public:
     explicit QShaderProgram(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QShaderProgram();
 
     enum ShaderType {
         Vertex = 0,
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index 31666baeb..9f1ed61d0 100644
--- a/src/render/materialsystem/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
@@ -66,11 +66,6 @@ QTechnique::QTechnique(QNode *parent)
     QObject::connect(&d->m_graphicsApiFilter, SIGNAL(graphicsApiFilterChanged()), this, SLOT(_q_graphicsApiFilterChanged()));
 }
 
-QTechnique::~QTechnique()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QTechnique::QTechnique(QTechniquePrivate &dd, QNode *parent)
     : QNode(dd, parent)
diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h
index 49c624154..90d0cbc5f 100644
--- a/src/render/materialsystem/qtechnique.h
+++ b/src/render/materialsystem/qtechnique.h
@@ -62,7 +62,6 @@ class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode
 
 public:
     explicit QTechnique(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QTechnique();
 
     void addFilterKey(QFilterKey*criterion);
     void removeFilterKey(QFilterKey*criterion);
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index 132041147..111332fda 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -132,11 +132,6 @@ QObjectPicker::QObjectPicker(Qt3DCore::QNode *parent)
 {
 }
 
-QObjectPicker::~QObjectPicker()
-{
-    QComponent::cleanup();
-}
-
 void QObjectPicker::setHoverEnabled(bool hoverEnabled)
 {
     Q_D(QObjectPicker);
diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h
index d66fa9d9d..cddb731b8 100644
--- a/src/render/picking/qobjectpicker.h
+++ b/src/render/picking/qobjectpicker.h
@@ -61,7 +61,6 @@ class QT3DRENDERSHARED_EXPORT QObjectPicker : public Qt3DCore::QComponent
 
 public:
     explicit QObjectPicker(QNode *parent = Q_NULLPTR);
-    ~QObjectPicker();
 
     bool isHoverEnabled() const;
     bool isDragEnabled() const;
diff --git a/src/render/renderstates/qalphacoverage.cpp b/src/render/renderstates/qalphacoverage.cpp
index 58f6b006c..d5ced01fc 100644
--- a/src/render/renderstates/qalphacoverage.cpp
+++ b/src/render/renderstates/qalphacoverage.cpp
@@ -60,11 +60,6 @@ QAlphaCoverage::QAlphaCoverage(QNode *parent)
 {
 }
 
-QAlphaCoverage::~QAlphaCoverage()
-{
-    QNode::cleanup();
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h
index 7a5eb4615..885bc8651 100644
--- a/src/render/renderstates/qalphacoverage.h
+++ b/src/render/renderstates/qalphacoverage.h
@@ -54,7 +54,6 @@ class QT3DRENDERSHARED_EXPORT QAlphaCoverage : public QRenderState
     Q_OBJECT
 public:
     explicit QAlphaCoverage(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QAlphaCoverage();
 
 private:
     Q_DECLARE_PRIVATE(QAlphaCoverage)
diff --git a/src/render/renderstates/qalphatest.cpp b/src/render/renderstates/qalphatest.cpp
index 676e30008..f0e29cec1 100644
--- a/src/render/renderstates/qalphatest.cpp
+++ b/src/render/renderstates/qalphatest.cpp
@@ -51,11 +51,6 @@ QAlphaTest::QAlphaTest(QNode *parent)
 {
 }
 
-QAlphaTest::~QAlphaTest()
-{
-    QNode::cleanup();
-}
-
 void QAlphaTest::copy(const QNode *ref)
 {
     QRenderState::copy(ref);
diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h
index c7595c705..df8e4a4e9 100644
--- a/src/render/renderstates/qalphatest.h
+++ b/src/render/renderstates/qalphatest.h
@@ -69,7 +69,6 @@ public:
     Q_ENUM(AlphaFunction)
 
     explicit QAlphaTest(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QAlphaTest();
 
     AlphaFunction alphaFunction() const;
     float referenceValue() const;
diff --git a/src/render/renderstates/qblendequation.cpp b/src/render/renderstates/qblendequation.cpp
index bcf482fc1..d805062a9 100644
--- a/src/render/renderstates/qblendequation.cpp
+++ b/src/render/renderstates/qblendequation.cpp
@@ -58,11 +58,6 @@ QBlendEquation::QBlendEquation(QNode *parent)
 {
 }
 
-QBlendEquation::~QBlendEquation()
-{
-    QNode::cleanup();
-}
-
 QBlendEquation::BlendFunction QBlendEquation::blendFunction() const
 {
     Q_D(const QBlendEquation);
diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h
index 504dc99d1..cde1b07c3 100644
--- a/src/render/renderstates/qblendequation.h
+++ b/src/render/renderstates/qblendequation.h
@@ -66,7 +66,6 @@ public:
     Q_ENUM(BlendFunction)
 
     explicit QBlendEquation(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QBlendEquation();
 
     BlendFunction blendFunction() const;
 
diff --git a/src/render/renderstates/qblendequationarguments.cpp b/src/render/renderstates/qblendequationarguments.cpp
index 4d0751a0e..03e0bf68f 100644
--- a/src/render/renderstates/qblendequationarguments.cpp
+++ b/src/render/renderstates/qblendequationarguments.cpp
@@ -83,11 +83,6 @@ QBlendEquationArguments::QBlendEquationArguments(QNode *parent)
 {
 }
 
-QBlendEquationArguments::~QBlendEquationArguments()
-{
-    QNode::cleanup();
-}
-
 /*! \fn void QBlendEquationArguments::copy(const Qt3DCore::QNode *ref)
   \internal
   Copies \a ref into this object.
diff --git a/src/render/renderstates/qblendequationarguments.h b/src/render/renderstates/qblendequationarguments.h
index bf0e9ff7d..05a6378f7 100644
--- a/src/render/renderstates/qblendequationarguments.h
+++ b/src/render/renderstates/qblendequationarguments.h
@@ -85,7 +85,6 @@ public:
     Q_ENUM(Blending)
 
     explicit QBlendEquationArguments(Qt3DCore::QNode *parent = 0);
-    ~QBlendEquationArguments();
 
     Blending sourceRgb() const;
     Blending destinationRgb() const;
diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp
index 2c5792f81..14b3e4aba 100644
--- a/src/render/renderstates/qclipplane.cpp
+++ b/src/render/renderstates/qclipplane.cpp
@@ -78,11 +78,6 @@ QClipPlane::QClipPlane(QNode *parent)
 {
 }
 
-QClipPlane::~QClipPlane()
-{
-    QNode::cleanup();
-}
-
 /*!
  * Returns the index of the clip plane.
  * \note usually between 0-7
diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h
index 19d3eac5b..0e5489871 100644
--- a/src/render/renderstates/qclipplane.h
+++ b/src/render/renderstates/qclipplane.h
@@ -57,7 +57,6 @@ class QT3DRENDERSHARED_EXPORT QClipPlane : public QRenderState
     Q_PROPERTY(float distance READ distance WRITE setDistance NOTIFY distanceChanged)
 public:
     explicit QClipPlane(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QClipPlane();
 
     int planeIndex() const;
     QVector3D normal() const;
diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp
index 1086cc372..c9677154e 100644
--- a/src/render/renderstates/qcolormask.cpp
+++ b/src/render/renderstates/qcolormask.cpp
@@ -67,11 +67,6 @@ QColorMask::QColorMask(QNode *parent)
 {
 }
 
-QColorMask::~QColorMask()
-{
-    QNode::cleanup();
-}
-
 bool QColorMask::isRedMasked() const
 {
     Q_D(const QColorMask);
diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h
index b7519aac9..042a07b71 100644
--- a/src/render/renderstates/qcolormask.h
+++ b/src/render/renderstates/qcolormask.h
@@ -58,7 +58,6 @@ class QT3DRENDERSHARED_EXPORT QColorMask : public QRenderState
 
 public:
     explicit QColorMask(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QColorMask();
 
     bool isRedMasked() const;
     bool isGreenMasked() const;
diff --git a/src/render/renderstates/qcullface.cpp b/src/render/renderstates/qcullface.cpp
index d2cc54b63..cb7dc3f28 100644
--- a/src/render/renderstates/qcullface.cpp
+++ b/src/render/renderstates/qcullface.cpp
@@ -51,11 +51,6 @@ QCullFace::QCullFace(QNode *parent)
 {
 }
 
-QCullFace::~QCullFace()
-{
-    QNode::cleanup();
-}
-
 void QCullFace::copy(const QNode *ref)
 {
     QRenderState::copy(ref);
diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h
index 4a0357289..cc766d32d 100644
--- a/src/render/renderstates/qcullface.h
+++ b/src/render/renderstates/qcullface.h
@@ -67,7 +67,6 @@ public:
     Q_ENUM(CullingMode)
 
     explicit QCullFace(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QCullFace();
 
     CullingMode mode() const;
 
diff --git a/src/render/renderstates/qdepthtest.cpp b/src/render/renderstates/qdepthtest.cpp
index 64a1bff74..c8348e161 100644
--- a/src/render/renderstates/qdepthtest.cpp
+++ b/src/render/renderstates/qdepthtest.cpp
@@ -58,11 +58,6 @@ QDepthTest::QDepthTest(QNode *parent)
 {
 }
 
-QDepthTest::~QDepthTest()
-{
-    QNode::cleanup();
-}
-
 QDepthTest::DepthFunction QDepthTest::depthFunction() const
 {
     Q_D(const QDepthTest);
diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h
index 4d9b96a81..d6b57e95b 100644
--- a/src/render/renderstates/qdepthtest.h
+++ b/src/render/renderstates/qdepthtest.h
@@ -68,7 +68,6 @@ public:
     Q_ENUM(DepthFunction)
 
     explicit QDepthTest(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QDepthTest();
 
     DepthFunction depthFunction() const;
 
diff --git a/src/render/renderstates/qdithering.cpp b/src/render/renderstates/qdithering.cpp
index 316135b74..d32940680 100644
--- a/src/render/renderstates/qdithering.cpp
+++ b/src/render/renderstates/qdithering.cpp
@@ -62,11 +62,6 @@ QDithering::QDithering(QNode *parent)
 {
 }
 
-QDithering::~QDithering()
-{
-    QNode::cleanup();
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h
index 68fa28139..aae5aa1e5 100644
--- a/src/render/renderstates/qdithering.h
+++ b/src/render/renderstates/qdithering.h
@@ -54,7 +54,6 @@ class QT3DRENDERSHARED_EXPORT QDithering : public QRenderState
     Q_OBJECT
 public:
     explicit QDithering(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QDithering();
 
 private:
     Q_DECLARE_PRIVATE(QDithering)
diff --git a/src/render/renderstates/qfrontface.cpp b/src/render/renderstates/qfrontface.cpp
index e05110f29..300626a63 100644
--- a/src/render/renderstates/qfrontface.cpp
+++ b/src/render/renderstates/qfrontface.cpp
@@ -51,11 +51,6 @@ QFrontFace::QFrontFace(QNode *parent)
 {
 }
 
-QFrontFace::~QFrontFace()
-{
-    QNode::cleanup();
-}
-
 void QFrontFace::copy(const QNode *ref)
 {
     QRenderState::copy(ref);
diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h
index bc205382d..02bbbb67d 100644
--- a/src/render/renderstates/qfrontface.h
+++ b/src/render/renderstates/qfrontface.h
@@ -63,7 +63,6 @@ public:
     Q_ENUM(WindingDirection)
 
     explicit QFrontFace(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QFrontFace();
 
     WindingDirection direction() const;
 
diff --git a/src/render/renderstates/qmultisampleantialiasing.cpp b/src/render/renderstates/qmultisampleantialiasing.cpp
index 63dd25834..1c042874e 100644
--- a/src/render/renderstates/qmultisampleantialiasing.cpp
+++ b/src/render/renderstates/qmultisampleantialiasing.cpp
@@ -62,11 +62,6 @@ QMultiSampleAntiAliasing::QMultiSampleAntiAliasing(QNode *parent)
 {
 }
 
-QMultiSampleAntiAliasing::~QMultiSampleAntiAliasing()
-{
-    QNode::cleanup();
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/renderstates/qmultisampleantialiasing.h b/src/render/renderstates/qmultisampleantialiasing.h
index 8384a27fe..8393a38ab 100644
--- a/src/render/renderstates/qmultisampleantialiasing.h
+++ b/src/render/renderstates/qmultisampleantialiasing.h
@@ -54,7 +54,6 @@ class QT3DRENDERSHARED_EXPORT QMultiSampleAntiAliasing : public QRenderState
 
 public:
     explicit QMultiSampleAntiAliasing(Qt3DCore::QNode *parent = nullptr);
-    ~QMultiSampleAntiAliasing();
 
 private:
     Q_DECLARE_PRIVATE(QMultiSampleAntiAliasing)
diff --git a/src/render/renderstates/qnodepthmask.cpp b/src/render/renderstates/qnodepthmask.cpp
index 985b9dc0e..f55b73d42 100644
--- a/src/render/renderstates/qnodepthmask.cpp
+++ b/src/render/renderstates/qnodepthmask.cpp
@@ -63,11 +63,6 @@ QNoDepthMask::QNoDepthMask(QNode *parent)
 {
 }
 
-QNoDepthMask::~QNoDepthMask()
-{
-    QNode::cleanup();
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/renderstates/qnodepthmask.h b/src/render/renderstates/qnodepthmask.h
index 175300416..d4fa653fa 100644
--- a/src/render/renderstates/qnodepthmask.h
+++ b/src/render/renderstates/qnodepthmask.h
@@ -54,7 +54,6 @@ class QT3DRENDERSHARED_EXPORT  QNoDepthMask : public QRenderState
     Q_OBJECT
 public:
     explicit QNoDepthMask(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QNoDepthMask();
 
 private:
     Q_DECLARE_PRIVATE(QNoDepthMask)
diff --git a/src/render/renderstates/qpointsize.cpp b/src/render/renderstates/qpointsize.cpp
index 04b9b972b..c3fa6e3ee 100644
--- a/src/render/renderstates/qpointsize.cpp
+++ b/src/render/renderstates/qpointsize.cpp
@@ -61,11 +61,6 @@ QPointSize::QPointSize(Qt3DCore::QNode *parent)
 {
 }
 
-QPointSize::~QPointSize()
-{
-    QNode::cleanup();
-}
-
 QPointSize::SizeMode QPointSize::sizeMode() const
 {
     Q_D(const QPointSize);
diff --git a/src/render/renderstates/qpointsize.h b/src/render/renderstates/qpointsize.h
index 706d676e5..66628a694 100644
--- a/src/render/renderstates/qpointsize.h
+++ b/src/render/renderstates/qpointsize.h
@@ -61,7 +61,6 @@ public:
     Q_ENUM(SizeMode)
 
     explicit QPointSize(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QPointSize();
 
     SizeMode sizeMode() const;
     float value() const;
diff --git a/src/render/renderstates/qpolygonoffset.cpp b/src/render/renderstates/qpolygonoffset.cpp
index 240d2a8ca..590c434db 100644
--- a/src/render/renderstates/qpolygonoffset.cpp
+++ b/src/render/renderstates/qpolygonoffset.cpp
@@ -50,11 +50,6 @@ QPolygonOffset::QPolygonOffset(QNode *parent)
 {
 }
 
-QPolygonOffset::~QPolygonOffset()
-{
-    QNode::cleanup();
-}
-
 float QPolygonOffset::scaleFactor() const
 {
     Q_D(const QPolygonOffset);
diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h
index 07e4f5838..599397e42 100644
--- a/src/render/renderstates/qpolygonoffset.h
+++ b/src/render/renderstates/qpolygonoffset.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QPolygonOffset : public QRenderState
     Q_PROPERTY(float depthSteps READ depthSteps WRITE setDepthSteps NOTIFY depthStepsChanged)
 public:
     explicit QPolygonOffset(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QPolygonOffset();
 
     float scaleFactor() const;
     float depthSteps() const;
diff --git a/src/render/renderstates/qscissortest.cpp b/src/render/renderstates/qscissortest.cpp
index 322b323da..ea24838bc 100644
--- a/src/render/renderstates/qscissortest.cpp
+++ b/src/render/renderstates/qscissortest.cpp
@@ -51,11 +51,6 @@ QScissorTest::QScissorTest(QNode *parent)
 {
 }
 
-QScissorTest::~QScissorTest()
-{
-    QNode::cleanup();
-}
-
 void QScissorTest::copy(const QNode *ref)
 {
     QRenderState::copy(ref);
diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h
index 2bdd6539a..9e7b770cc 100644
--- a/src/render/renderstates/qscissortest.h
+++ b/src/render/renderstates/qscissortest.h
@@ -59,7 +59,6 @@ class QT3DRENDERSHARED_EXPORT QScissorTest  : public QRenderState
 
 public:
     explicit QScissorTest(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QScissorTest();
 
     int left() const;
     int bottom() const;
diff --git a/src/render/renderstates/qseamlesscubemap.cpp b/src/render/renderstates/qseamlesscubemap.cpp
index 3af947063..0c68cb4ca 100644
--- a/src/render/renderstates/qseamlesscubemap.cpp
+++ b/src/render/renderstates/qseamlesscubemap.cpp
@@ -62,11 +62,6 @@ QSeamlessCubemap::QSeamlessCubemap(QNode *parent)
 {
 }
 
-QSeamlessCubemap::~QSeamlessCubemap()
-{
-    QNode::cleanup();
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/renderstates/qseamlesscubemap.h b/src/render/renderstates/qseamlesscubemap.h
index e938144bf..f9fc11170 100644
--- a/src/render/renderstates/qseamlesscubemap.h
+++ b/src/render/renderstates/qseamlesscubemap.h
@@ -54,7 +54,6 @@ class QT3DRENDERSHARED_EXPORT QSeamlessCubemap : public QRenderState
 
 public:
     explicit QSeamlessCubemap(Qt3DCore::QNode *parent = nullptr);
-    ~QSeamlessCubemap();
 
 private:
     Q_DECLARE_PRIVATE(QSeamlessCubemap)
diff --git a/src/render/renderstates/qstencilmask.cpp b/src/render/renderstates/qstencilmask.cpp
index fba387e8b..fe62b87d0 100644
--- a/src/render/renderstates/qstencilmask.cpp
+++ b/src/render/renderstates/qstencilmask.cpp
@@ -54,11 +54,6 @@ QStencilMask::QStencilMask(QNode *parent)
 {
 }
 
-QStencilMask::~QStencilMask()
-{
-    QNode::cleanup();
-}
-
 void QStencilMask::setFrontOutputMask(uint mask)
 {
     Q_D(QStencilMask);
diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h
index 5480ba3b8..ed75d3222 100644
--- a/src/render/renderstates/qstencilmask.h
+++ b/src/render/renderstates/qstencilmask.h
@@ -55,7 +55,6 @@ class QT3DRENDERSHARED_EXPORT QStencilMask : public QRenderState
     Q_PROPERTY(uint backOutputMask READ backOutputMask WRITE setBackOutputMask NOTIFY backOutputMaskChanged)
 public:
     explicit QStencilMask(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QStencilMask();
 
     uint frontOutputMask() const;
     uint backOutputMask() const;
diff --git a/src/render/renderstates/qstenciloperation.cpp b/src/render/renderstates/qstenciloperation.cpp
index 32e134f4a..b8ea5bf24 100644
--- a/src/render/renderstates/qstenciloperation.cpp
+++ b/src/render/renderstates/qstenciloperation.cpp
@@ -51,11 +51,6 @@ QStencilOperation::QStencilOperation(QNode *parent)
 {
 }
 
-QStencilOperation::~QStencilOperation()
-{
-    QNode::cleanup();
-}
-
 QStencilOperationArguments *QStencilOperation::front() const
 {
     Q_D(const QStencilOperation);
diff --git a/src/render/renderstates/qstenciloperation.h b/src/render/renderstates/qstenciloperation.h
index 6af756d0c..6d5ae615e 100644
--- a/src/render/renderstates/qstenciloperation.h
+++ b/src/render/renderstates/qstenciloperation.h
@@ -57,7 +57,6 @@ class QT3DRENDERSHARED_EXPORT QStencilOperation : public QRenderState
 
 public:
     explicit QStencilOperation(Qt3DCore::QNode *parent = 0);
-    ~QStencilOperation();
 
     QStencilOperationArguments *front() const;
     QStencilOperationArguments *back() const;
diff --git a/src/render/renderstates/qstenciltest.cpp b/src/render/renderstates/qstenciltest.cpp
index 233389cb0..a6ccf860d 100644
--- a/src/render/renderstates/qstenciltest.cpp
+++ b/src/render/renderstates/qstenciltest.cpp
@@ -52,11 +52,6 @@ QStencilTest::QStencilTest(QNode *parent)
 {
 }
 
-QStencilTest::~QStencilTest()
-{
-    QNode::cleanup();
-}
-
 QStencilTestArguments *QStencilTest::front() const
 {
     Q_D(const QStencilTest);
diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h
index bf465f7c2..3ffca7d89 100644
--- a/src/render/renderstates/qstenciltest.h
+++ b/src/render/renderstates/qstenciltest.h
@@ -56,9 +56,7 @@ class QT3DRENDERSHARED_EXPORT QStencilTest : public QRenderState
     Q_PROPERTY(Qt3DRender::QStencilTestArguments *front READ front CONSTANT)
     Q_PROPERTY(Qt3DRender::QStencilTestArguments *back READ back CONSTANT)
 public:
-
     explicit QStencilTest(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QStencilTest();
 
     QStencilTestArguments *front() const;
     QStencilTestArguments *back() const;
diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp
index c352912fc..4b2f87791 100644
--- a/src/render/texture/qabstracttexture.cpp
+++ b/src/render/texture/qabstracttexture.cpp
@@ -118,13 +118,6 @@ QAbstractTexture::QAbstractTexture(QAbstractTexturePrivate &dd, QNode *parent)
 {
 }
 
-QAbstractTexture::~QAbstractTexture()
-{
-    // The subclasses of QAbstractTexture are only there to set the type on a QTextureProvider
-    // QNode::cleanup needs to be handled here and not in the subclasses.
-    QNode::cleanup();
-}
-
 /*!
     Sets the size of the texture provider to width \a w, height \a h and depth \a d.
  */
diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h
index 31148b946..f25b08afe 100644
--- a/src/render/texture/qabstracttexture.h
+++ b/src/render/texture/qabstracttexture.h
@@ -266,8 +266,6 @@ public:
     };
     Q_ENUM(ComparisonMode)
 
-    ~QAbstractTexture();
-
     Target target() const;
 
     TextureFormat format() const;
diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp
index ab416bdc6..09a2dadf4 100644
--- a/src/render/texture/qtexture.cpp
+++ b/src/render/texture/qtexture.cpp
@@ -73,10 +73,6 @@ QTexture1D::QTexture1D(QNode *parent)
 {
 }
 
-QTexture1D::~QTexture1D()
-{
-}
-
 /*!
     \class Qt3DRender::QTexture1DArray
     \inmodule Qt3DRender
@@ -92,10 +88,6 @@ QTexture1DArray::QTexture1DArray(QNode *parent)
 {
 }
 
-QTexture1DArray::~QTexture1DArray()
-{
-}
-
 /*!
     \class Qt3DRender::QTexture2D
     \inmodule Qt3DRender
@@ -111,10 +103,6 @@ QTexture2D::QTexture2D(QNode *parent)
 {
 }
 
-QTexture2D::~QTexture2D()
-{
-}
-
 /*!
     \class Qt3DRender::QTexture2DArray
     \inmodule Qt3DRender
@@ -130,11 +118,6 @@ QTexture2DArray::QTexture2DArray(QNode *parent)
 {
 }
 
-QTexture2DArray::~QTexture2DArray()
-{
-}
-
-
 /*!
     \class Qt3DRender::QTexture3D
     \inmodule Qt3DRender
@@ -150,10 +133,6 @@ QTexture3D::QTexture3D(QNode *parent)
 {
 }
 
-QTexture3D::~QTexture3D()
-{
-}
-
 /*!
     \class Qt3DRender::QTextureCubeMap
     \inmodule Qt3DRender
@@ -169,10 +148,6 @@ QTextureCubeMap::QTextureCubeMap(QNode *parent)
 {
 }
 
-QTextureCubeMap::~QTextureCubeMap()
-{
-}
-
 /*!
     \class Qt3DRender::QTextureCubeMapArray
     \inmodule Qt3DRender
@@ -188,11 +163,6 @@ QTextureCubeMapArray::QTextureCubeMapArray(QNode *parent)
 {
 }
 
-QTextureCubeMapArray::~QTextureCubeMapArray()
-{
-    QNode::cleanup();
-}
-
 /*!
     \class Qt3DRender::QTexture2DMultisample
     \inmodule Qt3DRender
@@ -208,10 +178,6 @@ QTexture2DMultisample::QTexture2DMultisample(QNode *parent)
 {
 }
 
-QTexture2DMultisample::~QTexture2DMultisample()
-{
-}
-
 /*!
     \class Qt3DRender::QTexture2DMultisampleArray
     \inmodule Qt3DRender
@@ -227,10 +193,6 @@ QTexture2DMultisampleArray::QTexture2DMultisampleArray(QNode *parent)
 {
 }
 
-QTexture2DMultisampleArray::~QTexture2DMultisampleArray()
-{
-}
-
 /*!
     \class Qt3DRender::QTextureRectangle
     \inmodule Qt3DRender
@@ -246,10 +208,6 @@ QTextureRectangle::QTextureRectangle(QNode *parent)
 {
 }
 
-QTextureRectangle::~QTextureRectangle()
-{
-}
-
 /*!
     \class Qt3DRender::QTextureBuffer
     \inmodule Qt3DRender
@@ -265,20 +223,12 @@ QTextureBuffer::QTextureBuffer(QNode *parent)
 {
 }
 
-QTextureBuffer::~QTextureBuffer()
-{
-}
-
 QTextureLoader::QTextureLoader(QNode *parent)
     : QAbstractTexture(*new QTextureLoaderPrivate, parent)
 {
     d_func()->m_target = TargetAutomatic;
 }
 
-QTextureLoader::~QTextureLoader()
-{
-}
-
 QUrl QTextureLoader::source() const
 {
     Q_D(const QTextureLoader);
diff --git a/src/render/texture/qtexture.h b/src/render/texture/qtexture.h
index 3b1bc2f8c..e1c4faea4 100644
--- a/src/render/texture/qtexture.h
+++ b/src/render/texture/qtexture.h
@@ -60,7 +60,6 @@ class QT3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTexture1D(Qt3DCore::QNode *parent = 0);
-    ~QTexture1D();
 };
 
 class QT3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTexture
@@ -68,7 +67,6 @@ class QT3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTexture1DArray(Qt3DCore::QNode *parent = 0);
-    ~QTexture1DArray();
 };
 
 class QT3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTexture
@@ -76,7 +74,6 @@ class QT3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTexture2D(Qt3DCore::QNode *parent = 0);
-    ~QTexture2D();
 };
 
 class QT3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTexture
@@ -84,7 +81,6 @@ class QT3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTexture2DArray(Qt3DCore::QNode *parent = 0);
-    ~QTexture2DArray();
 };
 
 class QT3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTexture
@@ -92,7 +88,6 @@ class QT3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTexture3D(Qt3DCore::QNode *parent = 0);
-    ~QTexture3D();
 };
 
 class QT3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTexture
@@ -100,7 +95,6 @@ class QT3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTextureCubeMap(Qt3DCore::QNode *parent = 0);
-    ~QTextureCubeMap();
 };
 
 class QT3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexture
@@ -108,7 +102,6 @@ class QT3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTextureCubeMapArray(Qt3DCore::QNode *parent = 0);
-    ~QTextureCubeMapArray();
 };
 
 class QT3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTexture
@@ -116,7 +109,6 @@ class QT3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTexture2DMultisample(Qt3DCore::QNode *parent = 0);
-    ~QTexture2DMultisample();
 };
 
 class QT3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTexture
@@ -124,7 +116,6 @@ class QT3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTextu
     Q_OBJECT
 public:
     explicit QTexture2DMultisampleArray(Qt3DCore::QNode *parent = 0);
-    ~QTexture2DMultisampleArray();
 };
 
 class QT3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTexture
@@ -132,7 +123,6 @@ class QT3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTextureRectangle(Qt3DCore::QNode *parent = 0);
-    ~QTextureRectangle();
 };
 
 class QT3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTexture
@@ -140,7 +130,6 @@ class QT3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTexture
     Q_OBJECT
 public:
     explicit QTextureBuffer(Qt3DCore::QNode *parent = 0);
-    ~QTextureBuffer();
 };
 
 class QTextureLoaderPrivate;
@@ -152,7 +141,6 @@ class QT3DRENDERSHARED_EXPORT QTextureLoader : public QAbstractTexture
 
 public:
     explicit QTextureLoader(Qt3DCore::QNode *parent = nullptr);
-    ~QTextureLoader();
 
     QUrl source() const;
 
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index 4e4f43cbf..a074a514e 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -76,14 +76,6 @@ QTextureImage::QTextureImage(QNode *parent)
 }
 
 /*!
-  The destructor.
- */
-QTextureImage::~QTextureImage()
-{
-    QNode::cleanup();
-}
-
-/*!
     Returns the source url from which data for the texture image will be loaded.
  */
 QUrl QTextureImage::source() const
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h
index e774eb7c8..db6e0276d 100644
--- a/src/render/texture/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
@@ -57,7 +57,6 @@ class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
 
 public:
     explicit QTextureImage(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QTextureImage();
 
     enum Status {
         None = 0,
diff --git a/tests/auto/core/cloning/tst_cloning.cpp b/tests/auto/core/cloning/tst_cloning.cpp
index 749027d71..3ab68e34a 100644
--- a/tests/auto/core/cloning/tst_cloning.cpp
+++ b/tests/auto/core/cloning/tst_cloning.cpp
@@ -50,11 +50,6 @@ public:
     explicit MyQNode(Qt3DCore::QNode *parent = 0) : QNode(parent)
     {}
 
-    ~MyQNode()
-    {
-        QNode::cleanup();
-    }
-
     void setCustomProperty(const QString &s) { m_customProperty = s; }
     QString customProperty() const { return m_customProperty; }
 
@@ -82,11 +77,6 @@ public:
     explicit MyQComponent(Qt3DCore::QNode *parent = 0) : QComponent(parent)
     {}
 
-    ~MyQComponent()
-    {
-        QNode::cleanup();
-    }
-
     QT3D_CLONEABLE(MyQComponent)
 };
 
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 973db6c0e..418625c31 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -169,7 +169,7 @@ public:
 
     ~MyQNode()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
         delete m_scene;
     }
 
@@ -203,7 +203,7 @@ signals:
     void customPropertyChanged();
 
 protected:
-    QT3D_CLONEABLE(MyQNode)
+    QT3D_CLONEABLE_CUSTOM_DTOR(MyQNode)
 
     QString m_customProperty;
     Qt3DCore::QScene *m_scene;
@@ -216,11 +216,6 @@ public:
     explicit MyQComponent(Qt3DCore::QNode *parent = 0) : QComponent(parent)
     {}
 
-    ~MyQComponent()
-    {
-        QNode::cleanup();
-    }
-
     // QNode interface
 protected:
     QT3D_CLONEABLE(MyQComponent)
diff --git a/tests/auto/core/qentity/tst_qentity.cpp b/tests/auto/core/qentity/tst_qentity.cpp
index 9e21b0f45..208191d33 100644
--- a/tests/auto/core/qentity/tst_qentity.cpp
+++ b/tests/auto/core/qentity/tst_qentity.cpp
@@ -67,11 +67,6 @@ public:
         : QComponent(parent)
     {}
 
-    ~MyQComponent()
-    {
-        QNode::cleanup();
-    }
-
 protected:
     QT3D_CLONEABLE(MyQComponent)
 };
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index 2983159f8..67e8855d8 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -84,11 +84,6 @@ public:
     tst_Node() : Qt3DCore::QNode()
     {}
 
-    ~tst_Node()
-    {
-        QNode::cleanup();
-    }
-
 protected:
     QT3D_CLONEABLE(tst_Node)
 };
@@ -100,11 +95,6 @@ public:
     tst_Component() : Qt3DCore::QComponent()
     {}
 
-    ~tst_Component()
-    {
-        QNode::cleanup();
-    }
-
 protected:
     QT3D_CLONEABLE(tst_Component)
 };
diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp
index bcf260cab..43ee5cfed 100644
--- a/tests/auto/core/qtransform/tst_qtransform.cpp
+++ b/tests/auto/core/qtransform/tst_qtransform.cpp
@@ -37,11 +37,6 @@ using namespace Qt3DCore;
 class tst_QTransform : public QNode
 {
     Q_OBJECT
-public:
-    ~tst_QTransform()
-    {
-        QNode::cleanup();
-    }
 
 private Q_SLOTS:
     void checkCloning_data()
diff --git a/tests/auto/input/commons/testdevice.h b/tests/auto/input/commons/testdevice.h
index e768df9e5..fac185710 100644
--- a/tests/auto/input/commons/testdevice.h
+++ b/tests/auto/input/commons/testdevice.h
@@ -37,11 +37,6 @@ public:
         : Qt3DInput::QAbstractPhysicalDevice(parent)
     {}
 
-    ~TestDevice()
-    {
-        QNode::cleanup();
-    }
-
     int axisCount() const Q_DECL_FINAL { return 0; }
     int buttonCount() const Q_DECL_FINAL { return 0; }
     QStringList axisNames() const Q_DECL_FINAL { return QStringList(); }
diff --git a/tests/auto/input/qaction/tst_qaction.cpp b/tests/auto/input/qaction/tst_qaction.cpp
index 16b961d83..b414d2718 100644
--- a/tests/auto/input/qaction/tst_qaction.cpp
+++ b/tests/auto/input/qaction/tst_qaction.cpp
@@ -46,11 +46,6 @@ public:
     {
     }
 
-    ~tst_QAction()
-    {
-        QNode::cleanup();
-    }
-
 private Q_SLOTS:
 
     void checkCloning_data()
diff --git a/tests/auto/input/qactioninput/tst_qactioninput.cpp b/tests/auto/input/qactioninput/tst_qactioninput.cpp
index 6a56e731c..22f06bc4f 100644
--- a/tests/auto/input/qactioninput/tst_qactioninput.cpp
+++ b/tests/auto/input/qactioninput/tst_qactioninput.cpp
@@ -47,11 +47,6 @@ public:
         qRegisterMetaType<Qt3DInput::QAbstractPhysicalDevice*>("Qt3DInput::QAbstractPhysicalDevice*");
     }
 
-    ~tst_QActionInput()
-    {
-        QNode::cleanup();
-    }
-
 private Q_SLOTS:
     void checkCloning_data()
     {
diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp
index af018e214..7d8801b67 100644
--- a/tests/auto/input/qaxis/tst_qaxis.cpp
+++ b/tests/auto/input/qaxis/tst_qaxis.cpp
@@ -46,11 +46,6 @@ public:
     {
     }
 
-    ~tst_QAxis()
-    {
-        QNode::cleanup();
-    }
-
 private Q_SLOTS:
 
     void checkCloning_data()
diff --git a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
index 489337da9..cc196ff82 100644
--- a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
+++ b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
@@ -47,11 +47,6 @@ public:
         qRegisterMetaType<Qt3DInput::QAbstractPhysicalDevice*>("Qt3DInput::QAbstractPhysicalDevice*");
     }
 
-    ~tst_QAxisInput()
-    {
-        QNode::cleanup();
-    }
-
 private Q_SLOTS:
     void checkCloning_data()
     {
diff --git a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
index de1031da2..206928a1b 100644
--- a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
+++ b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
@@ -46,11 +46,6 @@ public:
     {
     }
 
-    ~tst_QLogicalDevice()
-    {
-        QNode::cleanup();
-    }
-
 private Q_SLOTS:
 
     void checkCloning_data()
diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp
index 80fc6bbf9..d0a468a4d 100644
--- a/tests/auto/render/qattribute/tst_qattribute.cpp
+++ b/tests/auto/render/qattribute/tst_qattribute.cpp
@@ -48,7 +48,7 @@ public:
 
     ~tst_QAttribute()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index ef6865e7b..fdbc568b2 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -69,7 +69,7 @@ class tst_QBuffer: public Qt3DCore::QNode
 public:
     ~tst_QBuffer()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
index c7ed6c34a..895cffcf5 100644
--- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
+++ b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
@@ -43,7 +43,7 @@ class tst_QCameraSelector: public Qt3DCore::QNode
 public:
     ~tst_QCameraSelector()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp
index e2762fb85..9442ced90 100644
--- a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp
+++ b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp
@@ -42,7 +42,7 @@ class tst_QClearBuffers: public Qt3DCore::QNode
 public:
     ~tst_QClearBuffers()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
index 9e22bbbfb..cc20200ab 100644
--- a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
+++ b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
@@ -49,7 +49,7 @@ class tst_QDefaultMeshes: public Qt3DCore::QNode
 public:
     ~tst_QDefaultMeshes()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp
index 63fb9ac3b..9b3a35521 100644
--- a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp
+++ b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp
@@ -44,11 +44,6 @@ public:
     {
     }
 
-    ~MyFrameGraphNode()
-    {
-        QNode::cleanup();
-    }
-
 private:
     QT3D_CLONEABLE(MyFrameGraphNode)
 };
@@ -61,7 +56,7 @@ class tst_QFrameGraphNode: public Qt3DCore::QNode
 public:
     ~tst_QFrameGraphNode()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp
index c11eb1692..72c3f4977 100644
--- a/tests/auto/render/qgeometry/tst_qgeometry.cpp
+++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp
@@ -41,11 +41,6 @@
 class tst_QGeometry: public Qt3DCore::QNode
 {
     Q_OBJECT
-public:
-    ~tst_QGeometry()
-    {
-        QNode::cleanup();
-    }
 
 private Q_SLOTS:
 
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index 0c3284c7f..5c0425323 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -69,11 +69,6 @@ private:
 class tst_QGeometryRenderer: public Qt3DCore::QNode
 {
     Q_OBJECT
-public:
-    ~tst_QGeometryRenderer()
-    {
-        QNode::cleanup();
-    }
 
 private Q_SLOTS:
 
diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
index eb9400151..175285a69 100644
--- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
+++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
@@ -42,7 +42,7 @@ class tst_QLayerFilter: public Qt3DCore::QNode
 public:
     ~tst_QLayerFilter()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qlight/tst_qlight.cpp b/tests/auto/render/qlight/tst_qlight.cpp
index 67a0cd716..31d827870 100644
--- a/tests/auto/render/qlight/tst_qlight.cpp
+++ b/tests/auto/render/qlight/tst_qlight.cpp
@@ -45,7 +45,7 @@ class tst_QLight: public Qt3DCore::QNode
 public:
     ~tst_QLight()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index acf03ea87..6111a5355 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -62,11 +62,6 @@ public:
         setEffect(m_effect);
     }
 
-    ~TestMaterial()
-    {
-        QNode::cleanup();
-    }
-
     Qt3DRender::QEffect *m_effect;
     Qt3DRender::QTechnique *m_technique;
     Qt3DRender::QRenderPass *m_renderPass;
@@ -85,11 +80,6 @@ public:
         qRegisterMetaType<Qt3DRender::QEffect*>("Qt3DRender::QEffect*");
     }
 
-    ~tst_QMaterial()
-    {
-        QNode::cleanup();
-    }
-
 private:
 
     void compareEffects(const Qt3DRender::QEffect *original, const Qt3DRender::QEffect *clone)
diff --git a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
index bd5a9f323..84e164778 100644
--- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
+++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
@@ -67,7 +67,7 @@ public:
 
     ~tst_QObjectPicker()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
index 8818345e6..81ba80235 100644
--- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
+++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
@@ -45,7 +45,7 @@ class tst_QRenderPassFilter: public Qt3DCore::QNode
 public:
     ~tst_QRenderPassFilter()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp
index 98b112f1b..add6e29d6 100644
--- a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp
+++ b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp
@@ -55,11 +55,6 @@ public:
         : Qt3DRender::QRenderState(*new MyStateSetPrivate(), parent)
     {}
 
-    ~MyStateSet()
-    {
-        QNode::cleanup();
-    }
-
 private:
     QT3D_CLONEABLE(MyStateSet)
     Q_DECLARE_PRIVATE(MyStateSet)
@@ -73,7 +68,7 @@ class tst_QRenderStateSet: public Qt3DCore::QNode
 public:
     ~tst_QRenderStateSet()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
index ba9af19f2..bbe28f85f 100644
--- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
+++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
@@ -43,7 +43,7 @@ class tst_QRenderTargetSelector: public Qt3DCore::QNode
 public:
     ~tst_QRenderTargetSelector()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp b/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp
index 619990b97..eb202132b 100644
--- a/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp
+++ b/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp
@@ -42,7 +42,7 @@ class tst_QSortCriterion: public Qt3DCore::QNode
 public:
     ~tst_QSortCriterion()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
index bed90077b..5c8787fb2 100644
--- a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
+++ b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
@@ -44,7 +44,7 @@ class tst_QSortPolicy: public Qt3DCore::QNode
 public:
     ~tst_QSortPolicy()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
index ca2ead21e..fdf0d2742 100644
--- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
+++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
@@ -45,7 +45,7 @@ class tst_QTechniqueFilter: public Qt3DCore::QNode
 public:
     ~tst_QTechniqueFilter()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS:
diff --git a/tests/auto/render/qviewport/tst_qviewport.cpp b/tests/auto/render/qviewport/tst_qviewport.cpp
index 2984cfb3e..88b54cac6 100644
--- a/tests/auto/render/qviewport/tst_qviewport.cpp
+++ b/tests/auto/render/qviewport/tst_qviewport.cpp
@@ -42,7 +42,7 @@ class tst_QViewport: public Qt3DCore::QNode
 public:
     ~tst_QViewport()
     {
-        QNode::cleanup();
+        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
     }
 
 private Q_SLOTS: