aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickitemparticle_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/particles/qquickitemparticle_p.h')
-rw-r--r--src/particles/qquickitemparticle_p.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h
index 9d4e1b8f62..4f8d81a8df 100644
--- a/src/particles/qquickitemparticle_p.h
+++ b/src/particles/qquickitemparticle_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
class QQuickItemParticleAttached;
-class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickItemParticle : public QQuickParticlePainter
+class Q_QUICKPARTICLES_EXPORT QQuickItemParticle : public QQuickParticlePainter
{
Q_OBJECT
Q_PROPERTY(bool fade READ fade WRITE setFade NOTIFY fadeChanged)
@@ -71,6 +71,10 @@ protected:
void initialize(int gIdx, int pIdx) override;
void prepareNextFrame();
private:
+ bool clockShouldUpdate() const;
+ void updateClock();
+ void reconnectSystem(QQuickParticleSystem *system);
+ void reconnectParent(QQuickItem *parent);
void processDeletables();
void tick(int time = 0);
QSet<QQuickItem* > m_deletables;
@@ -85,12 +89,16 @@ private:
typedef QTickAnimationProxy<QQuickItemParticle, &QQuickItemParticle::tick> Clock;
Clock *clock;
+ QMetaObject::Connection m_systemRunStateConnection;
+ QMetaObject::Connection m_systemPauseStateConnection;
+ QMetaObject::Connection m_systemEnabledStateConnection;
+ QMetaObject::Connection m_parentEnabledStateConnection;
};
class QQuickItemParticleAttached : public QObject
{
Q_OBJECT
- Q_PROPERTY(QQuickItemParticle* particle READ particle CONSTANT);
+ Q_PROPERTY(QQuickItemParticle* particle READ particle CONSTANT FINAL);
public:
QQuickItemParticleAttached(QObject* parent)
: QObject(parent), m_mp(0), m_parentItem(nullptr)