diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-09-20 17:57:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-21 07:11:25 +0200 |
| commit | 46bb4a02bd37e402dd7387f1fcc439ca72772671 (patch) | |
| tree | 35f4284f143926fd39eb73242f03b77c91001b53 /src | |
| parent | 04591bc1e8f45ec60e4d2c13aa557bbd5dda90f9 (diff) | |
Augment Documentation
Change-Id: Ie76de2631521cd3e50aa56f6b134fa33682b81cd
Reviewed-on: http://codereview.qt-project.org/5208
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/particles/qsgparticleaffector.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/particles/qsgparticleaffector.cpp b/src/declarative/particles/qsgparticleaffector.cpp index ac2d0ab8a0..12b81351d7 100644 --- a/src/declarative/particles/qsgparticleaffector.cpp +++ b/src/declarative/particles/qsgparticleaffector.cpp @@ -65,11 +65,17 @@ QT_BEGIN_NAMESPACE If empty, it will affect all particles. */ /*! - \qmlproperty list<string> QtQuick.Particles2::Affector::collisionParticles + \qmlproperty list<string> QtQuick.Particles2::Affector::whenCollidingWith If any logical particle groups are specified here, then the affector will only be triggered if the particle being examined intersects with a particle of one of these groups. + This is different from the groups property. The groups property selects which + particles might be examined, and if they meet other criteria (including being + within the bounds of the Affector, modified by shape) then they will be tested + again to see if they intersect with a particles from one of the particle groups + in whenCollidingWith. + By default, no groups are specified. */ /*! |