aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickparticlesystem_p.h
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-10-23 16:01:57 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-10-27 14:35:26 +0100
commit32af8055985c1f978574eec62512638f472e8290 (patch)
tree875dcea67e2d8289c055ce96ebb8c048dff025ee /src/particles/qquickparticlesystem_p.h
parentc7ea1cd9237045e3a8b2b148c57f6d26dd547f7e (diff)
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 <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/particles/qquickparticlesystem_p.h')
-rw-r--r--src/particles/qquickparticlesystem_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index 81d78de8ac..4d6c153282 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -137,6 +137,9 @@ public:
QQuickParticleData(QQuickParticleSystem* sys);
~QQuickParticleData();
+ QQuickParticleData(const QQuickParticleData &other);
+ QQuickParticleData &operator=(const QQuickParticleData &other);
+
//Convenience functions for working backwards, because parameters are from the start of particle life
//If setting multiple parameters at once, doing the conversion yourself will be faster.