diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-08-23 20:03:43 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-24 12:27:43 +0200 |
commit | 1253db60ee2586b1546cbaeeacb7b8c3d77ab255 (patch) | |
tree | 3566db4d1038b6b628fd73fba21ce4251385da56 /src/declarative/particles/qsgparticleemitter_p.h | |
parent | b9a16a039692327a9f6975456667b5bd36afb4c8 (diff) |
Absorb CustomEmitter/Affector
The signal is now on the Emitter/Affector base type, but only
emitted if connected to (to save creating the v8 object)
Change-Id: Ib5522e0f760caa17a6ad731b2dfbce9994a7664e
Reviewed-on: http://codereview.qt.nokia.com/3393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgparticleemitter_p.h')
-rw-r--r-- | src/declarative/particles/qsgparticleemitter_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/particles/qsgparticleemitter_p.h b/src/declarative/particles/qsgparticleemitter_p.h index d3c9327773..2c75fbfe22 100644 --- a/src/declarative/particles/qsgparticleemitter_p.h +++ b/src/declarative/particles/qsgparticleemitter_p.h @@ -119,6 +119,7 @@ public: void setSpeedFromMovement(qreal s); virtual void componentComplete(); signals: + void emitParticle(QDeclarativeV8Handle particle); void particlesPerSecondChanged(qreal); void particleDurationChanged(int); void emittingChanged(bool); @@ -348,6 +349,7 @@ protected: QPointF m_last_last_emitter; QPointF m_last_last_last_emitter; + bool isEmitConnected(); private: QSGStochasticDirection m_nullVector; |