diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /src/quick/particles/qquickparticlesystem_p.h | |
parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'src/quick/particles/qquickparticlesystem_p.h')
-rw-r--r-- | src/quick/particles/qquickparticlesystem_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/particles/qquickparticlesystem_p.h b/src/quick/particles/qquickparticlesystem_p.h index 7a16b77df3..277dda1771 100644 --- a/src/quick/particles/qquickparticlesystem_p.h +++ b/src/quick/particles/qquickparticlesystem_p.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the Declarative module of the Qt Toolkit. ** @@ -200,6 +200,7 @@ public: float autoRotate;//Assume that GPUs prefer floats to bools float animIdx; float frameDuration; + float frameAt;//Used for duration -1 float frameCount; float animT; float animX; @@ -302,6 +303,7 @@ public: void updateCurrentTime( int currentTime ); QQuickParticleSystemAnimation* m_animation; bool m_running; + bool m_debugMode; int timeInt; bool initialized; @@ -340,7 +342,6 @@ private: QSignalMapper m_painterMapper; QSignalMapper m_emitterMapper; bool m_paused; - bool m_debugMode; bool m_allDead; bool m_empty; }; |