diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
| commit | c80eb38354854f2ccc7ea070a9857409acc36792 (patch) | |
| tree | 806cb68b337ac7c8ab8f9a48538e6e0211f57ed8 /src/particles/qquickparticleemitter.cpp | |
| parent | d38bac596946c3dd9cce3c0b4127509421dc917d (diff) | |
| parent | f19ec4561b4975d68290593b599d3c38d0f9f6d3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/qml/jsruntime/qv4engine.cpp
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/qquicktableview.cpp
Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Done-With: Shawn Rutledge <shawn.rutledge@qt.io>
Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd
Diffstat (limited to 'src/particles/qquickparticleemitter.cpp')
| -rw-r--r-- | src/particles/qquickparticleemitter.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index 4e36ad149a..c0d9fa941d 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -191,10 +191,10 @@ QT_BEGIN_NAMESPACE /*! \qmlsignal QtQuick.Particles::Emitter::emitParticles(Array particles) - This signal is emitted when particles are emitted. particles is a JavaScript + This signal is emitted when particles are emitted. \a particles is a JavaScript array of Particle objects. You can modify particle attributes directly within the handler. - Note that JavaScript is slower to execute, so it is not recommended to use this in + \note JavaScript is slower to execute, so it is not recommended to use this in high-volume particle systems. The corresponding handler is \c onEmitParticles. @@ -202,19 +202,20 @@ QT_BEGIN_NAMESPACE /*! \qmlmethod QtQuick.Particles::Emitter::burst(int count) - Emits count particles from this emitter immediately. + Emits a number of particles, specified by \a count, from this emitter immediately. */ /*! \qmlmethod QtQuick.Particles::Emitter::burst(int count, int x, int y) - Emits count particles from this emitter immediately. The particles are emitted - as if the Emitter was positioned at x,y but all other properties are the same. + Emits a number of particles, specified by \a count, from this emitter immediately. + The particles are emitted as if the Emitter was positioned at (\a {x}, \a {y}) but + all other properties are the same. */ /*! \qmlmethod QtQuick.Particles::Emitter::pulse(int duration) - If the emitter is not enabled, enables it for duration milliseconds and then switches - it back off. + If the emitter is not enabled, enables it for a specified \a duration + (in milliseconds) and then switches it back off. */ QQuickParticleEmitter::QQuickParticleEmitter(QQuickItem *parent) : |