diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-04-24 03:25:13 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-04-24 03:25:13 (GMT) |
commit | 6ef6a8184ebb969f951a7c55127e9445eba64d35 (patch) | |
tree | 0bb0d3e549573c3e5769896ae655e7743c78de09 /src/declarative/fx/qfxparticles.cpp | |
parent | ce1d3e9118494e535fb3c1b4e34d8feced7afdd1 (diff) | |
parent | 53fd3ca280c85572d5f38e0f2809e7601578d41e (diff) | |
download | Qt-6ef6a8184ebb969f951a7c55127e9445eba64d35.zip Qt-6ef6a8184ebb969f951a7c55127e9445eba64d35.tar.gz Qt-6ef6a8184ebb969f951a7c55127e9445eba64d35.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxparticles.cpp')
-rw-r--r-- | src/declarative/fx/qfxparticles.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp index 939afba..9319c46 100644 --- a/src/declarative/fx/qfxparticles.cpp +++ b/src/declarative/fx/qfxparticles.cpp @@ -917,7 +917,7 @@ void QFxParticles::setStreamIn(bool b) will be produced until it is set to true. */ /*! - \property bool Particles::emitting + \property QFxParticles::emitting If emitting is set to false no new particles will be created. This means that when a particle reaches the end of its lifespan it is not replaced. This property can be used to turn particles on and off with a more natural look. |