diff options
Diffstat (limited to 'src/particles/qquickitemparticle_p.h')
-rw-r--r-- | src/particles/qquickitemparticle_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h index 70cfe2a446..32c9881691 100644 --- a/src/particles/qquickitemparticle_p.h +++ b/src/particles/qquickitemparticle_p.h @@ -108,9 +108,8 @@ protected: private: void processDeletables(); void tick(int time = 0); - QList<QQuickItem* > m_deletables; + QSet<QQuickItem* > m_deletables; QList<QQuickItem* > m_managed; - QList< QQuickParticleData* > m_loadables; bool m_fade; QList<QQuickItem*> m_pendingItems; @@ -130,13 +129,14 @@ class QQuickItemParticleAttached : public QObject Q_PROPERTY(QQuickItemParticle* particle READ particle CONSTANT); public: QQuickItemParticleAttached(QObject* parent) - : QObject(parent), m_mp(0) + : QObject(parent), m_mp(0), m_parentItem(nullptr) {;} QQuickItemParticle* particle() const { return m_mp; } void detach(){Q_EMIT detached();} void attach(){Q_EMIT attached();} private: QQuickItemParticle* m_mp; + QPointer<QQuickItem> m_parentItem; friend class QQuickItemParticle; Q_SIGNALS: void detached(); |