diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 10:53:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 10:53:43 +0100 |
| commit | 20a51e87fd15b8a6c1503b905399f7befe31114b (patch) | |
| tree | 5a8667150568ed798d63eb165372c198549498c2 /src/particles | |
| parent | 6c152bf27f94f01b2942b02e370df4fa01e0d40f (diff) | |
| parent | 084dbb06d7b00c4a67edb6ce58956150036c35f2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickparticleemitter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index 7e1a31f206..4d9f834492 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -343,7 +343,7 @@ void QQuickParticleEmitter::emitWindow(int timeStamp) { if (m_system == 0) return; - if ((!m_enabled || !m_particlesPerSecond)&& !m_pulseLeft && m_burstQueue.isEmpty()){ + if ((!m_enabled || m_particlesPerSecond <= 0)&& !m_pulseLeft && m_burstQueue.isEmpty()){ m_reset_last = true; return; } |