De-inline some more dtors of non-leaf Private classes

Change-Id: I2d80f964c4de6ef6cef144ca50fa12ffb3eb540c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

12 files changed, 51 insertions, 15 deletions

diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index 9749faa71..57222a364 100644
--- a/src/render/geometry/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
@@ -56,6 +56,16 @@ QGeometryFactory::~QGeometryFactory()
 {
 }
 
+QGeometryPrivate::QGeometryPrivate()
+    : QNodePrivate(),
+      m_boundingVolumePositionAttribute(nullptr)
+{
+}
+
+QGeometryPrivate::~QGeometryPrivate()
+{
+}
+
 /*!
  * \qmltype Geometry
  * \instantiates Qt3DRender::QGeometry
@@ -87,9 +97,7 @@ QGeometryFactory::~QGeometryFactory()
  * Constructs a new QGeometry with \a parent.
  */
 QGeometry::QGeometry(QNode *parent)
-    : QNode(*new QGeometryPrivate(), parent)
-{
-}
+    : QGeometry(*new QGeometryPrivate(), parent) {}
 
 /*!
  * \internal
diff --git a/src/render/geometry/qgeometry_p.h b/src/render/geometry/qgeometry_p.h
index 41d58f494..e07b9ff0d 100644
--- a/src/render/geometry/qgeometry_p.h
+++ b/src/render/geometry/qgeometry_p.h
@@ -51,20 +51,19 @@
 // We mean it.
 //
 
+#include <Qt3DRender/private/qt3drender_global_p.h>
 #include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QGeometryPrivate : public Qt3DCore::QNodePrivate
+class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     Q_DECLARE_PUBLIC(QGeometry)
-    QGeometryPrivate()
-        : QNodePrivate()
-        , m_boundingVolumePositionAttribute(nullptr)
-    {}
+    QGeometryPrivate();
+    ~QGeometryPrivate();
 
 
     QVector<QAttribute *> m_attributes;
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index 97cf4836c..a714c3155 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -66,6 +66,10 @@ QGeometryRendererPrivate::QGeometryRendererPrivate()
 {
 }
 
+QGeometryRendererPrivate::~QGeometryRendererPrivate()
+{
+}
+
 /*!
  * \qmltype GeometryRenderer
  * \instantiates Qt3DRender::QGeometryRenderer
diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h
index 905f99b8e..622cfb254 100644
--- a/src/render/geometry/qgeometryrenderer_p.h
+++ b/src/render/geometry/qgeometryrenderer_p.h
@@ -65,6 +65,8 @@ class QGeometryRendererPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QGeometryRendererPrivate();
+    ~QGeometryRendererPrivate();
+
     Q_DECLARE_PUBLIC(QGeometryRenderer)
 
     int m_instanceCount;
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp
index e3d0d86bf..0f8e5c19f 100644
--- a/src/render/lights/qabstractlight.cpp
+++ b/src/render/lights/qabstractlight.cpp
@@ -61,6 +61,10 @@ QAbstractLightPrivate::QAbstractLightPrivate(QAbstractLight::Type type)
     m_shaderData->setProperty("type", type);
 }
 
+QAbstractLightPrivate::~QAbstractLightPrivate()
+{
+}
+
 Qt3DCore::QNodeCreatedChangeBasePtr QAbstractLight::createNodeCreationChange() const
 {
     auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAbstractLightData>::create(this);
diff --git a/src/render/lights/qabstractlight_p.h b/src/render/lights/qabstractlight_p.h
index 1e5ce588f..bfab787a3 100644
--- a/src/render/lights/qabstractlight_p.h
+++ b/src/render/lights/qabstractlight_p.h
@@ -64,6 +64,7 @@ class Q_AUTOTEST_EXPORT QAbstractLightPrivate : public Qt3DCore::QComponentPriva
 {
 public:
     explicit QAbstractLightPrivate(QAbstractLight::Type type);
+    ~QAbstractLightPrivate();
 
     Q_DECLARE_PUBLIC(QAbstractLight)
     QAbstractLight::Type m_type;
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index 192167244..644c11b4d 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -84,6 +84,10 @@ QMaterialPrivate::QMaterialPrivate()
 {
 }
 
+QMaterialPrivate::~QMaterialPrivate()
+{
+}
+
 QMaterial::QMaterial(QNode *parent)
     : QComponent(*new QMaterialPrivate, parent)
 {
diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h
index 4368342ed..9fb8d5de9 100644
--- a/src/render/materialsystem/qmaterial_p.h
+++ b/src/render/materialsystem/qmaterial_p.h
@@ -65,6 +65,7 @@ class QT3DRENDERSHARED_PRIVATE_EXPORT QMaterialPrivate : public Qt3DCore::QCompo
 {
 public:
     QMaterialPrivate();
+    ~QMaterialPrivate();
 
     Q_DECLARE_PUBLIC(QMaterial)
     QVector<QParameter *> m_parameters;
diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp
index ce2f67f11..0367b6fc2 100644
--- a/src/render/renderstates/qrenderstate.cpp
+++ b/src/render/renderstates/qrenderstate.cpp
@@ -52,6 +52,10 @@ QRenderStatePrivate::QRenderStatePrivate(Type type)
 {
 }
 
+QRenderStatePrivate::~QRenderStatePrivate()
+{
+}
+
 QRenderStatePrivate *QRenderStatePrivate::get(QRenderState *state)
 {
     return state->d_func();
diff --git a/src/render/renderstates/qrenderstate_p.h b/src/render/renderstates/qrenderstate_p.h
index d59a2791c..1ec672cac 100644
--- a/src/render/renderstates/qrenderstate_p.h
+++ b/src/render/renderstates/qrenderstate_p.h
@@ -86,6 +86,9 @@ public:
     };
 
     QRenderStatePrivate(Type type);
+    ~QRenderStatePrivate();
+
+
     Q_DECLARE_PUBLIC(QRenderState)
 
 
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp
index b79ade739..d8cc89f87 100644
--- a/src/render/texture/qabstracttextureimage.cpp
+++ b/src/render/texture/qabstracttextureimage.cpp
@@ -47,6 +47,17 @@ using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
+QAbstractTextureImagePrivate::QAbstractTextureImagePrivate()
+    : QNodePrivate(),
+      m_mipLevel(0),
+      m_layer(0),
+      m_face(QAbstractTexture::CubeMapPositiveX)
+{
+}
+
+QAbstractTextureImagePrivate::~QAbstractTextureImagePrivate()
+{
+}
 
 /*!
     \qmltype AbstractTextureImage
diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h
index 5630643d8..f0d836055 100644
--- a/src/render/texture/qabstracttextureimage_p.h
+++ b/src/render/texture/qabstracttextureimage_p.h
@@ -64,13 +64,8 @@ class QAbstractTextureImage;
 class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate
 {
 public:
-    QAbstractTextureImagePrivate()
-        : QNodePrivate()
-        , m_mipLevel(0)
-        , m_layer(0)
-        , m_face(QAbstractTexture::CubeMapPositiveX)
-    {
-    }
+    QAbstractTextureImagePrivate();
+    ~QAbstractTextureImagePrivate();
 
     Q_DECLARE_PUBLIC(QAbstractTextureImage)