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

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

4 files changed, 21 insertions, 8 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;