diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-08-23 20:03:43 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-24 12:27:43 +0200 |
| commit | 1253db60ee2586b1546cbaeeacb7b8c3d77ab255 (patch) | |
| tree | 3566db4d1038b6b628fd73fba21ce4251385da56 /examples | |
| parent | b9a16a039692327a9f6975456667b5bd36afb4c8 (diff) | |
Absorb CustomEmitter/Affector
The signal is now on the Emitter/Affector base type, but only
emitted if connected to (to save creating the v8 object)
Change-Id: Ib5522e0f760caa17a6ad731b2dfbce9994a7664e
Reviewed-on: http://codereview.qt.nokia.com/3393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/particles/custom/custom.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/particles/custom/fallingleaves.qml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/particles/custom/custom.qml b/examples/declarative/particles/custom/custom.qml index 7a6b51d40e..9a562af3b6 100644 --- a/examples/declarative/particles/custom/custom.qml +++ b/examples/declarative/particles/custom/custom.qml @@ -27,7 +27,7 @@ ParticleSystem{ duration: 24000 } function convert(a){return a*(Math.PI/180);} - CustomEmitter{ + Emitter{ lifeSpan: 4000 emitRate: 120 size: 12 diff --git a/examples/declarative/particles/custom/fallingleaves.qml b/examples/declarative/particles/custom/fallingleaves.qml index 1d1282ebbb..3572490451 100644 --- a/examples/declarative/particles/custom/fallingleaves.qml +++ b/examples/declarative/particles/custom/fallingleaves.qml @@ -25,7 +25,7 @@ Item { xVariance: 60 pace: 60 } - CustomAffector{ + Affector{ system: sys property real coefficient: 0.1 property real speed: 1.5 @@ -56,7 +56,7 @@ Item { } } - CustomAffector{//Custom Friction, adds some 'randomness' + Affector{//Custom Friction, adds some 'randomness' system: sys //onceOff: true x: -60 |