Fix leaks in QQuickImageParticle

Make sure that ImageData instances, m_shadowData as well as the
QSGGeometry of particle nodes are destroyed together with their
QQuickImageParticle.

Also implement the assignment operator for QQuickParticleData to
avoid its v8Datum pointer to be copied over to the shadow datum
in getShadowDatum. This would cause a double delete of the
QQuickV4ParticleData when trying to call clearShadows() in the
destructor.

Task-number: QTBUG-36782
Change-Id: Ie03f2be0415daeb7f4f6e5f92295a3ab26a62155
Reviewed-by: Joerg Bornemann <[email protected]>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h
index ac61ceeb10..657d945bca 100644
--- a/src/particles/qquickimageparticle_p.h
+++ b/src/particles/qquickimageparticle_p.h
@@ -352,17 +352,16 @@ private:
         QUrl source;
         QQuickPixmap pix;
     };
-    ImageData *m_image;
-    ImageData *m_colorTable;
-    ImageData *m_sizeTable;
-    ImageData *m_opacityTable;
+    QScopedPointer<ImageData> m_image;
+    QScopedPointer<ImageData> m_colorTable;
+    QScopedPointer<ImageData> m_sizeTable;
+    QScopedPointer<ImageData> m_opacityTable;
     bool loadingSomething();
 
 
     QColor m_color;
     qreal m_color_variation;
 
-    QSGGeometryNode *m_rootNode;
     QHash<int, QSGGeometryNode *> m_nodes;
     QHash<int, int> m_idxStarts;//TODO: Proper resizing will lead to needing a spriteEngine per particle - do this after sprite engine gains transparent sharing?
     QList<QPair<int, int> > m_startsIdx;//Same data, optimized for alternate retrieval