From: Alan Alpert <alan.alpert@nokia.com>
Date: Wed, 8 Jun 2011 07:55:41 +0000 (+1000)
Subject: Immense Particles Refactor Part D
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=c8a5c00ec1c06f7c00070d55cd61cb8d52dc67cf;p=konrad%2Fqtdeclarative.git

Immense Particles Refactor Part D

Changed the names of several properties:
FollowEmitter:
emissionShape->emitShape
emissionHeight->emitHeight
emissionWidth->emitWidth
Emitter:
particlesPerSecond->emitRate
particleDuration->lifeSpan
particleDurationVariation->lifeSpanVariation
maxParticles->emitCap
particleSize->size
particleEndSize->endSize
particleSizeVariation->sizeVariation
ImageParticle:
image->source

And stopped being silly in the example launcher.
---

diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index 46827ae..7434646 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -242,9 +242,9 @@ Flipable {
                         width: Math.min(bigImage.width * bigImage.scale, flickable.width);
                         height: Math.min(bigImage.height * bigImage.scale, flickable.height);
                         anchors.centerIn: parent
-                        particleSize: 4
-                        particleDuration: flipDuration
-                        particlesPerSecond: 2048
+                        size: 4
+                        lifeSpan: flipDuration
+                        emitRate: 2048
                         emitting: false
                     }
                     CustomParticle{
diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml
index 30142b4..73a91a4 100644
--- a/demos/declarative/flickr/content/Progress.qml
+++ b/demos/declarative/flickr/content/Progress.qml
@@ -63,7 +63,7 @@ Item{
         color: "lightsteelblue"
         alpha: 0.1
         colorVariation: 0.05
-        image: "images/particle.png"
+        source: "images/particle.png"
         system: barSys
     }
     Emitter{
@@ -71,12 +71,12 @@ Item{
         x: 2; width: Math.max(parent.width * progress - 4, 0);
         speed: AngledDirection{ angleVariation: 180; magnitudeVariation: 12 }
         system: barSys
-        particlesPerSecond: width;
-        particleDuration: 1000
-        particleSize: 20
-        particleSizeVariation: 4
-        particleEndSize: 12
-        maxParticles: parent.width;
+        emitRate: width;
+        lifeSpan: 1000
+        size: 20
+        sizeVariation: 4
+        endSize: 12
+        emitCap: parent.width;
     }
 
     Text {
diff --git a/demos/declarative/flickr/content/StreamView.qml b/demos/declarative/flickr/content/StreamView.qml
index 22e7d5d..d7b608a 100644
--- a/demos/declarative/flickr/content/StreamView.qml
+++ b/demos/declarative/flickr/content/StreamView.qml
@@ -73,9 +73,9 @@ Item{
         y: -128
         height: 32
         speed: PointDirection{ y: (container.height + 128)/12 }
-        particlesPerSecond: 0.4
-        particleDuration: 1000000//eventually -1 should mean a million seconds for neatness
-        maxParticles: 15
+        emitRate: 0.4
+        lifeSpan: 1000000//eventually -1 should mean a million seconds for neatness
+        emitCap: 15
     }
     Emitter{
         system: sys
@@ -84,9 +84,9 @@ Item{
         y: -128
         height: 32
         speed: PointDirection{ y: (container.height + 128)/12 }
-        particlesPerSecond: 0.4
-        particleDuration: 1000000//eventually -1 should mean a million seconds for neatness
-        maxParticles: 15
+        emitRate: 0.4
+        lifeSpan: 1000000//eventually -1 should mean a million seconds for neatness
+        emitCap: 15
     }
     Emitter{
         system: sys
@@ -95,9 +95,9 @@ Item{
         y: -128
         height: 32
         speed: PointDirection{ y: (container.height + 128)/12 }
-        particlesPerSecond: 0.4
-        particleDuration: 1000000//eventually -1 should mean a million seconds for neatness
-        maxParticles: 15
+        emitRate: 0.4
+        lifeSpan: 1000000//eventually -1 should mean a million seconds for neatness
+        emitCap: 15
     }
     Kill{
         system: sys
diff --git a/demos/declarative/flickr/content/images/noise.png b/demos/declarative/flickr/content/images/noise.png
index abc3c18..c5a5ba0 100644
Binary files a/demos/declarative/flickr/content/images/noise.png and b/demos/declarative/flickr/content/images/noise.png differ
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index b7ab19d..c4c9b11 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -58,7 +58,7 @@ Item {
         }
         ImageParticle {
             particles: ["trail"]
-            image: "content/images/particle.png"
+            source: "content/images/particle.png"
             color: "#1A1A6F"
             alpha: 0.1
             colorVariation: 0.01
@@ -68,8 +68,8 @@ Item {
         Emitter {
             particle: "drops"
             width: parent.width
-            particlesPerSecond: 0.5
-            particleDuration: 20000
+            emitRate: 0.5
+            lifeSpan: 20000
             speed: PointDirection{
                 y: {screen.height/18} 
             }
@@ -78,16 +78,16 @@ Item {
         FollowEmitter {
             follow: "drops"
             particle: "trail"
-            particlesPerParticlePerSecond: 18
-            particleSize: 32
-            particleEndSize: 0
-            particleSizeVariation: 4
-            particleDuration: 1200
+            emitRatePerParticle: 18
+            size: 32
+            endSize: 0
+            sizeVariation: 4
+            lifeSpan: 1200
             system: bgParticles
             anchors.fill: parent
-            emissionWidth: 16
-            emissionHeight: 16
-            emissionShape: EllipseShape{}
+            emitWidth: 16
+            emitHeight: 16
+            emitShape: EllipseShape{}
         }
 
         VisualDataModel{
diff --git a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml b/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml
index fb30cd0..1242a85 100644
--- a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml
+++ b/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml
@@ -61,12 +61,12 @@ Item {
         anchors.fill: parent
         shape: EllipseShape{}
         speed: TargetedDirection{ targetX: width/2; targetY: width/2; magnitude: -1; proportionalMagnitude: true}
-        particleDuration: 1000
-        particlesPerSecond: 64 
+        lifeSpan: 1000
+        emitRate: 64 
 
-        particleSize: 24
-        particleSizeVariation: 24
-        particleEndSize: 0
+        size: 24
+        sizeVariation: 24
+        endSize: 0
     }
 
     property int blastsLeft: 0
@@ -119,12 +119,12 @@ Item {
         system: container.system
         anchors.centerIn: parent
 
-        particleDuration: 1000
-        particlesPerSecond: 16
-        maxParticles: blasts
-        particleSize: 24
-        particleEndSize:16
-        particleSizeVariation: 8
+        lifeSpan: 1000
+        emitRate: 16
+        emitCap: blasts
+        size: 24
+        endSize:16
+        sizeVariation: 8
         speed: TargetedDirection{
             id: blastVector
             targetX: target.x; targetY: target.y; magnitude: 1.1; proportionalMagnitude: true
diff --git a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml b/demos/declarative/plasmapatrol/content/CannonHardpoint.qml
index fd49e4d..b7572ef 100644
--- a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml
+++ b/demos/declarative/plasmapatrol/content/CannonHardpoint.qml
@@ -55,11 +55,11 @@ Item {
         emitting: container.show
         system: container.system
         anchors.centerIn: parent
-        particleDuration: 2000
-        particlesPerSecond: 1
+        lifeSpan: 2000
+        emitRate: 1
 
-        particleSize: 4
-        particleEndSize: 0
+        size: 4
+        endSize: 0
     }
 
     function fireAt(targetArg, hardpoint){
@@ -85,10 +85,10 @@ Item {
         system: container.system
         anchors.centerIn: parent
 
-        particleDuration: 1000
-        particlesPerSecond: 1
-        particleSize: 8
-        particleEndSize: 4
+        lifeSpan: 1000
+        emitRate: 1
+        size: 8
+        endSize: 4
         speed: TargetedDirection{
             id: blastVector
             targetX: target.x; targetY: target.y; magnitude: 1.1; proportionalMagnitude: true
diff --git a/demos/declarative/plasmapatrol/content/Cruiser.qml b/demos/declarative/plasmapatrol/content/Cruiser.qml
index 71af0ab..a844fa1 100644
--- a/demos/declarative/plasmapatrol/content/Cruiser.qml
+++ b/demos/declarative/plasmapatrol/content/Cruiser.qml
@@ -64,13 +64,13 @@ Item {
         height: 64
         shape: EllipseShape{}
 
-        particlesPerSecond: hp > 0 ?  hp * 1 + 20 : 0 
-        particleDuration: 2400
-        maxParticles: (maxHP * 1 + 20)*2.4
+        emitRate: hp > 0 ?  hp * 1 + 20 : 0 
+        lifeSpan: 2400
+        emitCap: (maxHP * 1 + 20)*2.4
 
-        particleSize: 48
-        particleSizeVariation: 16
-        particleEndSize: 16
+        size: 48
+        sizeVariation: 16
+        endSize: 16
 
         speed: AngledDirection{angleVariation:360; magnitudeVariation: 32}
     }
@@ -81,11 +81,11 @@ Item {
         shape: EllipseShape{ fill: false }
         emitting: hp>0
         
-        particlesPerSecond: 16
-        particleDuration: 2000
+        emitRate: 16
+        lifeSpan: 2000
 
-        particleSize: 48
-        particleSizeVariation: 24
+        size: 48
+        sizeVariation: 24
 
         SpriteGoal{
             id: destructor
diff --git a/demos/declarative/plasmapatrol/content/Frigate.qml b/demos/declarative/plasmapatrol/content/Frigate.qml
index f18de01..d314052 100644
--- a/demos/declarative/plasmapatrol/content/Frigate.qml
+++ b/demos/declarative/plasmapatrol/content/Frigate.qml
@@ -58,9 +58,9 @@ Item {
         system: container.system
         particle: "frigateShield"
         anchors.centerIn: parent
-        particleSize: 92
-        particlesPerSecond: 1
-        particleDuration: 4800
+        size: 92
+        emitRate: 1
+        lifeSpan: 4800
         emitting: hp > 0
     }
     Emitter{
@@ -71,12 +71,12 @@ Item {
         height: 16
         shape: EllipseShape{}
 
-        particleSize: 16
-        particleSizeVariation: 8
-        particleEndSize: 8
-        particlesPerSecond: hp > 0 ?  hp * 1 + 20 : 0 
-        particleDuration: 1200
-        maxParticles: (maxHP * 1 + 20)*2
+        size: 16
+        sizeVariation: 8
+        endSize: 8
+        emitRate: hp > 0 ?  hp * 1 + 20 : 0 
+        lifeSpan: 1200
+        emitCap: (maxHP * 1 + 20)*2
     }
     Timer{
         id: fireControl
diff --git a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml b/demos/declarative/plasmapatrol/content/LaserHardpoint.qml
index 3705d29..e994248 100644
--- a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml
+++ b/demos/declarative/plasmapatrol/content/LaserHardpoint.qml
@@ -57,12 +57,12 @@ Item {
         emitting: container.show
         shape: EllipseShape{}
         speed: TargetedDirection{ targetX: width/2; targetY: width/2; magnitude: -1; proportionalMagnitude: true }
-        particleDuration: 1000
-        particlesPerSecond: 64
+        lifeSpan: 1000
+        emitRate: 64
 
-        particleSize: 24
-        particleSizeVariation: 8
-        particleEndSize: 8
+        size: 24
+        sizeVariation: 8
+        endSize: 8
     }
 
     function fireAt(targetArg, hardpoint){
@@ -97,11 +97,11 @@ Item {
             mirrored: (emitter.y < 0 || emitter.x < 0) && !(emitter.y < 0 && emitter.x < 0 )//I just want XOR
         }
 
-        particleDuration: 1000
-        particlesPerSecond: 8000
-        maxParticles: 800
-        particleSize: 16
-        particleEndSize: 0
+        lifeSpan: 1000
+        emitRate: 8000
+        emitCap: 800
+        size: 16
+        endSize: 0
 
         speed: PointDirection{xVariation: 4; yVariation: 4}
     }
diff --git a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml b/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml
index 26d5f21..b65686e5 100644
--- a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml
+++ b/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml
@@ -46,7 +46,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["default"]
-        image: "pics/blur-circle3.png"
+        source: "pics/blur-circle3.png"
         color: "#003A3A3A"
         colorVariation: 0.1
         z: 0
@@ -54,7 +54,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["redTeam"]
-        image: "pics/blur-circle3.png"
+        source: "pics/blur-circle3.png"
         color: "#0028060A"
         colorVariation: 0.1
         z: 0
@@ -62,7 +62,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["greenTeam"]
-        image: "pics/blur-circle3.png"
+        source: "pics/blur-circle3.png"
         color: "#0006280A"
         colorVariation: 0.1
        z: 0
@@ -70,7 +70,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["blaster"]
-        image: "pics/star2.png"
+        source: "pics/star2.png"
         //color: "#0F282406"
         color: "#0F484416"
         colorVariation: 0.2
@@ -79,7 +79,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["laser"]
-        image: "pics/star3.png"
+        source: "pics/star3.png"
         //color: "#00123F68"
         color: "#00428FF8"
         colorVariation: 0.2
@@ -88,7 +88,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["cannon"]
-        image: "pics/particle.png"
+        source: "pics/particle.png"
         color: "#80FFAAFF"
         colorVariation: 0.1
         z: 2
@@ -96,7 +96,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["cannonCore"]
-        image: "pics/particle.png"
+        source: "pics/particle.png"
         color: "#00666666"
         colorVariation: 0.8
         z: 1
@@ -104,7 +104,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["cannonWake"]
-        image: "pics/star.png"
+        source: "pics/star.png"
         color: "#00CCCCCC"
         colorVariation: 0.2
         z: 1
@@ -112,7 +112,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["frigateShield"]
-        image: "pics/blur-circle2.png"
+        source: "pics/blur-circle2.png"
         color: "#00000000"
         colorVariation: 0.05
         blueVariation: 0.5
@@ -148,12 +148,12 @@ Item{
         system: sys
         particle: "cannonWake"
         follow: "cannon"
-        particlesPerParticlePerSecond: 64
-        particleDuration: 600
+        emitRatePerParticle: 64
+        lifeSpan: 600
         speed: AngledDirection{ angleVariation: 360; magnitude: 48}
-        particleSize: 16
-        particleEndSize: 8
-        particleSizeVariation: 2
+        size: 16
+        endSize: 8
+        sizeVariation: 2
         emitting: true
         width: 1000//XXX: Terrible hack
         height: 1000
@@ -162,10 +162,10 @@ Item{
         system: sys
         particle: "cannonCore"
         follow: "cannon"
-        particlesPerParticlePerSecond: 256
-        particleDuration: 128
-        particleSize: 24
-        particleEndSize: 8
+        emitRatePerParticle: 256
+        lifeSpan: 128
+        size: 24
+        endSize: 8
         emitting: true
         width: 1000//XXX: Terrible hack
         height: 1000
diff --git a/demos/declarative/plasmapatrol/content/Sloop.qml b/demos/declarative/plasmapatrol/content/Sloop.qml
index 20b60c5..1a6f3a9 100644
--- a/demos/declarative/plasmapatrol/content/Sloop.qml
+++ b/demos/declarative/plasmapatrol/content/Sloop.qml
@@ -63,15 +63,15 @@ Item {
         particle: container.shipParticle
         shape: EllipseShape{}
 
-        particlesPerSecond: hp > 0 ?  hp + 20 : 0 
-        particleDuration: blinkInterval
-        maxParticles: (maxHP + 20)
+        emitRate: hp > 0 ?  hp + 20 : 0 
+        lifeSpan: blinkInterval
+        emitCap: (maxHP + 20)
 
         acceleration: AngledDirection{angleVariation: 360; magnitude: 8}
 
-        particleSize: 24
-        particleEndSize: 4
-        particleSizeVariation: 8
+        size: 24
+        endSize: 4
+        sizeVariation: 8
         width: 16
         height: 16
         x: 64
diff --git a/demos/declarative/plasmapatrol/plasmapatrol.qml b/demos/declarative/plasmapatrol/plasmapatrol.qml
index c490dfd..dfc36de 100644
--- a/demos/declarative/plasmapatrol/plasmapatrol.qml
+++ b/demos/declarative/plasmapatrol/plasmapatrol.qml
@@ -98,12 +98,12 @@ Rectangle {
                         system: particles
                         emitting: true
                         particle: "default"
-                        particlesPerSecond: 1200
-                        particleDuration: 1200
+                        emitRate: 1200
+                        lifeSpan: 1200
                         shape: MaskShape{source:"content/pics/TitleText.png"}
-                        particleSize: 16
-                        particleEndSize: 0
-                        particleSizeVariation: 8
+                        size: 16
+                        endSize: 0
+                        sizeVariation: 8
                         speed: AngledDirection{angleVariation:360; magnitudeVariation: 6}
                     }
                 }
diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
index b234688..2a7e12f 100644
--- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml
+++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
@@ -88,11 +88,11 @@ Item {
         speed: TargetedDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -60; magnitudeVariation: 60}
         shape: EllipseShape{fill:true}
         emitting: false;
-        particleDuration: 700; particleDurationVariation: 100
-        particlesPerSecond: 1000
-        maxParticles: 100 //only fires 0.1s bursts (still 2x old number, ImageParticle wants less than 16000 max though)
-        particleSize: 28
-        particleEndSize: 14
+        lifeSpan: 700; lifeSpanVariation: 100
+        emitRate: 1000
+        emitCap: 100 //only fires 0.1s bursts (still 2x old number, ImageParticle wants less than 16000 max though)
+        size: 28
+        endSize: 14
     }
 
     states: [
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index c547e1a..88579de 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -81,7 +81,7 @@ Rectangle {
                 system: particleSystem
                 particles: ["red"]
                 color: Qt.darker("red");//Actually want desaturated...
-                image: "SamegameCore/pics/particle.png"
+                source: "SamegameCore/pics/particle.png"
                 colorVariation: 0.4
                 alpha: 0.1
             }
@@ -89,7 +89,7 @@ Rectangle {
                 system: particleSystem
                 particles: ["green"]
                 color: Qt.darker("green");//Actually want desaturated...
-                image: "SamegameCore/pics/particle.png"
+                source: "SamegameCore/pics/particle.png"
                 colorVariation: 0.4
                 alpha: 0.1
             }
@@ -97,7 +97,7 @@ Rectangle {
                 system: particleSystem
                 particles: ["blue"]
                 color: Qt.darker("blue");//Actually want desaturated...
-                image: "SamegameCore/pics/particle.png"
+                source: "SamegameCore/pics/particle.png"
                 colorVariation: 0.4
                 alpha: 0.1
             }
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
index e25b420..f8f7b0e 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
@@ -42,8 +42,8 @@ import "ImageProviderCore" // import the plugin that registers the color image p
 
 //![0]
 Column {
-    Image { source: "image://colors/yellow" }
-    Image { source: "image://colors/red" }
+    Image { source: "source://colors/yellow" }
+    Image { source: "source://colors/red" }
 }
 //![0]
 
diff --git a/examples/declarative/particles/allsmiles/plain.qml b/examples/declarative/particles/allsmiles/plain.qml
index 1b456b0..890a578 100644
--- a/examples/declarative/particles/allsmiles/plain.qml
+++ b/examples/declarative/particles/allsmiles/plain.qml
@@ -9,14 +9,14 @@ Rectangle{
     ImageParticle{
         id: up
         system: sys
-        image: "content/singlesmile.png"
+        source: "content/singlesmile.png"
     }
     Emitter{
         anchors.centerIn: parent
         system: sys
-        particlesPerSecond: 1000
-        particleSize: 20
-        particleDuration: 10000
+        emitRate: 1000
+        size: 20
+        lifeSpan: 10000
         speed: AngledDirection{angleVariation: 360; magnitudeVariation: 100;}
     }
     MouseArea{
diff --git a/examples/declarative/particles/allsmiles/smile.qml b/examples/declarative/particles/allsmiles/smile.qml
index 9ce0e3a..6b122e7 100644
--- a/examples/declarative/particles/allsmiles/smile.qml
+++ b/examples/declarative/particles/allsmiles/smile.qml
@@ -129,10 +129,10 @@ Rectangle{
         id: emitter
         system: sys
         emitting: false
-        particleDuration: 4000
-        maxParticles: 1200
+        lifeSpan: 4000
+        emitCap: 1200
         anchors.fill: parent
-        particleSize: 32
+        size: 32
         speed: PointDirection{ xVariation: 12; yVariation: 12 }
     }
     MouseArea{
diff --git a/examples/declarative/particles/allsmiles/smilefactory.qml b/examples/declarative/particles/allsmiles/smilefactory.qml
index 262644e..5b36eee 100644
--- a/examples/declarative/particles/allsmiles/smilefactory.qml
+++ b/examples/declarative/particles/allsmiles/smilefactory.qml
@@ -49,7 +49,7 @@ Rectangle{
     ImageParticle{
         system: sys
         particles: ["goingLeft", "goingRight"]
-        image: "content/singlesmile.png"
+        source: "content/singlesmile.png"
         rotation: 90
         rotationSpeed: 90
         autoRotation: true
@@ -57,7 +57,7 @@ Rectangle{
     ImageParticle{
         system: sys
         particles: ["goingDown"]
-        image: "content/squarefacespriteXX.png"
+        source: "content/squarefacespriteXX.png"
         rotation: 180
         yVector: PointDirection{ y: 0.5; yVariation: 0.25; xVariation: 0.25; }
     }
@@ -87,9 +87,9 @@ Rectangle{
         emitting: false
         particle: "goingRight"
         speed: PointDirection{ x: 100 }
-        particleDuration: 4000
-        particlesPerSecond: 2
-        particleSize: 32
+        lifeSpan: 4000
+        emitRate: 2
+        size: 32
     }
     Emitter{
         id: emitB
@@ -99,9 +99,9 @@ Rectangle{
         emitting: false
         particle: "goingLeft"
         speed: PointDirection{ x: -100 }
-        particleDuration: 4000
-        particlesPerSecond: 2
-        particleSize: 32
+        lifeSpan: 4000
+        emitRate: 2
+        size: 32
     }
     Emitter{
         id: emitC
@@ -111,8 +111,8 @@ Rectangle{
         emitting: false
         particle: "goingDown"
         speed: PointDirection{ x: 100 }
-        particleDuration: 4000
-        particlesPerSecond: 2
-        particleSize: 32
+        lifeSpan: 4000
+        emitRate: 2
+        size: 32
     }
 }
diff --git a/examples/declarative/particles/allsmiles/spriteparticles.qml b/examples/declarative/particles/allsmiles/spriteparticles.qml
index 1f385f2..f5479f1 100644
--- a/examples/declarative/particles/allsmiles/spriteparticles.qml
+++ b/examples/declarative/particles/allsmiles/spriteparticles.qml
@@ -48,7 +48,7 @@ Rectangle{
     ImageParticle{
         id: test
         particles: ["Test"]
-        image: "content/particle.png"
+        source: "content/particle.png"
         system: sys
         z: 2
         anchors.fill: parent
@@ -76,10 +76,10 @@ Rectangle{
         particle: "Test"
         anchors.fill: parent
         id: particles2
-        particlesPerSecond: 6000
-        particleDuration: 720
+        emitRate: 6000
+        lifeSpan: 720
         emitting: true
-        particleSize: 10
+        size: 10
         shape: mask
     }
     Emitter{
@@ -87,12 +87,12 @@ Rectangle{
         particle: "Face"
         anchors.fill: parent
         id: particles
-        particlesPerSecond: 60
-        particleDuration: 1440
+        emitRate: 60
+        lifeSpan: 1440
         emitting: true
         speed: PointDirection{xVariation: 10; yVariation: 10;}
-        particleSize: 30
-        particleSizeVariation: 10
+        size: 30
+        sizeVariation: 10
         shape: mask
     }
     ParticleSystem{
diff --git a/examples/declarative/particles/allsmiles/spritestateparticles.qml b/examples/declarative/particles/allsmiles/spritestateparticles.qml
index 0818686..a599c69 100644
--- a/examples/declarative/particles/allsmiles/spritestateparticles.qml
+++ b/examples/declarative/particles/allsmiles/spritestateparticles.qml
@@ -170,13 +170,13 @@ Rectangle{
     }
     Emitter{
         system: sys
-        particlesPerSecond: 16
-        particleDuration: 10000
+        emitRate: 16
+        lifeSpan: 10000
         emitting: true
         speed: AngledDirection{angle: 90; magnitude: 60; angleVariation: 5}
         acceleration: PointDirection{ y: 10 }
-        particleSize: 30
-        particleSizeVariation: 10
+        size: 30
+        sizeVariation: 10
         width: parent.width
         height: 100
     }
diff --git a/examples/declarative/particles/allsmiles/spritevariedparticles.qml b/examples/declarative/particles/allsmiles/spritevariedparticles.qml
index e6aeacc..d6e1372 100644
--- a/examples/declarative/particles/allsmiles/spritevariedparticles.qml
+++ b/examples/declarative/particles/allsmiles/spritevariedparticles.qml
@@ -96,13 +96,13 @@ Rectangle{
         id: particleEmitter
         system: sys
         width: parent.width
-        particlesPerSecond: 16
-        particleDuration: 8000
+        emitRate: 16
+        lifeSpan: 8000
         emitting: true
         speed: AngledDirection{angle: 90; magnitude: 300; magnitudeVariation: 100; angleVariation: 5}
         acceleration: PointDirection{ y: 10 }
-        particleSize: 30
-        particleSizeVariation: 10
+        size: 30
+        sizeVariation: 10
     }
     Binding{
         target: particleEmitter
diff --git a/examples/declarative/particles/allsmiles/ultraparticles.qml b/examples/declarative/particles/allsmiles/ultraparticles.qml
index f2b6f8d..0ea095d 100644
--- a/examples/declarative/particles/allsmiles/ultraparticles.qml
+++ b/examples/declarative/particles/allsmiles/ultraparticles.qml
@@ -84,12 +84,12 @@ Rectangle{
         system: sys
         anchors.centerIn: parent
         id: particles
-        particlesPerSecond: 200
-        particleDuration: 6000
+        emitRate: 200
+        lifeSpan: 6000
         emitting: true
         speed: AngledDirection{angleVariation: 360; magnitude: 80; magnitudeVariation: 40}
-        particleSize: 40
-        particleEndSize: 80
+        size: 40
+        endSize: 80
     }
     Text{
         x: 16
diff --git a/examples/declarative/particles/asteroid/asteroid.qml b/examples/declarative/particles/asteroid/asteroid.qml
index 223ea81..2ecfc42 100644
--- a/examples/declarative/particles/asteroid/asteroid.qml
+++ b/examples/declarative/particles/asteroid/asteroid.qml
@@ -68,7 +68,7 @@ Item {
     ImageParticle {
         system: sys
         particles: ["starfield"]
-        image: "content/star.png"
+        source: "content/star.png"
         colorVariation: 0.3
         color: "white"
     }
@@ -77,27 +77,27 @@ Item {
         system: sys
         particle: "starfield"
 
-        particlesPerSecond: 80
-        particleDuration: 2500
+        emitRate: 80
+        lifeSpan: 2500
 
         anchors.centerIn: parent
 
         //acceleration: AngledDirection{angleVariation: 360; magnitude: 200}//Is this a better effect, more consistent speed?
         acceleration: PointDirection{ xVariation: 200; yVariation: 200; }
 
-        particleSize: 0
-        particleEndSize: 80
-        particleSizeVariation: 10
+        size: 0
+        endSize: 80
+        sizeVariation: 10
     }
     Emitter{
         system: sys
         particle: "meteor"
-        particlesPerSecond: 12
-        particleDuration: 5000
+        emitRate: 12
+        lifeSpan: 5000
         emitting: true
         acceleration: PointDirection{ xVariation: 80; yVariation: 80; }
-        particleSize: 15
-        particleEndSize: 300
+        size: 15
+        endSize: 300
         anchors.centerIn: parent
      }
     ImageParticle{
@@ -172,7 +172,7 @@ Item {
         z:0 
         system: sys
         particles: ["exhaust"]
-        image: "content/particle4.png"
+        source: "content/particle4.png"
 
         color: "orange"
         SequentialAnimation on color {
@@ -196,8 +196,8 @@ Item {
         system: sys
         particle: "exhaust"
 
-        particlesPerSecond: 300
-        particleDuration: 500
+        emitRate: 300
+        lifeSpan: 500
 
         y: holder.y
         x: holder.x 
@@ -207,7 +207,7 @@ Item {
 
         acceleration: PointDirection{ xVariation: 10; yVariation: 10; }
 
-        particleSize: 4
-        particleSizeVariation: 4
+        size: 4
+        sizeVariation: 4
     }
 }
diff --git a/examples/declarative/particles/asteroid/blackhole.qml b/examples/declarative/particles/asteroid/blackhole.qml
index 1bc406b..4a7ce02 100644
--- a/examples/declarative/particles/asteroid/blackhole.qml
+++ b/examples/declarative/particles/asteroid/blackhole.qml
@@ -68,22 +68,22 @@ Rectangle{
     Emitter{
         particle: "stars"
         system: particles
-        particlesPerSecond: 40
-        particleDuration: 4000
+        emitRate: 40
+        lifeSpan: 4000
         emitting: true
-        particleSize: 30
-        particleSizeVariation: 10
+        size: 30
+        sizeVariation: 10
         speed: PointDirection{ x: 220; xVariation: 40 }
         height: parent.height
     }
     Emitter{
         particle: "roids"
         system: particles
-        particlesPerSecond: 10
-        particleDuration: 4000
+        emitRate: 10
+        lifeSpan: 4000
         emitting: true
-        particleSize: 30
-        particleSizeVariation: 10
+        size: 30
+        sizeVariation: 10
         speed: PointDirection{ x: 220; xVariation: 40 }
         height: parent.height
     }
@@ -95,7 +95,7 @@ Rectangle{
         id: stars
         particles: ["stars"]
         system: particles
-        image: "content/star.png"
+        source: "content/star.png"
         color: "white"
         colorVariation: 0.1
         alpha: 0
@@ -117,7 +117,7 @@ Rectangle{
         id: shot
         particles: ["shot"]
         system: particles
-        image: "content/star.png"
+        source: "content/star.png"
 
         color: "#0FF06600"
         colorVariation: 0.3
@@ -126,7 +126,7 @@ Rectangle{
         id: engine
         particles: ["engine"]
         system: particles
-        image: "content/particle4.png"
+        source: "content/particle4.png"
 
         color: "orange"
         SequentialAnimation on color {
@@ -172,12 +172,12 @@ Rectangle{
         Emitter{
             particle: "engine"
             system: particles
-            particlesPerSecond: 200
-            particleDuration: 1000
+            emitRate: 200
+            lifeSpan: 1000
             emitting: true
-            particleSize: 10
-            particleEndSize: 4
-            particleSizeVariation: 4
+            size: 10
+            endSize: 4
+            sizeVariation: 4
             speed: PointDirection{ x: -128; xVariation: 32 }
             height: parent.height
             width: 20
@@ -185,10 +185,10 @@ Rectangle{
         Emitter{
             particle: "shot"
             system: particles
-            particlesPerSecond: 32
-            particleDuration: 2000
+            emitRate: 32
+            lifeSpan: 2000
             emitting: spacePressed
-            particleSize: 40
+            size: 40
             speed: PointDirection{ x: 256; }
             x: parent.width
             y: parent.height/2
diff --git a/examples/declarative/particles/custom/blurparticles.qml b/examples/declarative/particles/custom/blurparticles.qml
index 7d0f9cc..8a3e9ad 100644
--- a/examples/declarative/particles/custom/blurparticles.qml
+++ b/examples/declarative/particles/custom/blurparticles.qml
@@ -11,10 +11,10 @@ Rectangle{
     Emitter{
         system:sys
         height: parent.height
-        particlesPerSecond: 1
-        particleDuration: 12000
+        emitRate: 1
+        lifeSpan: 12000
         speed: PointDirection{x:20;}
-        particleSize: 64
+        size: 64
     }
     ShaderEffectSource{
         id: theSource
diff --git a/examples/declarative/particles/exampleslauncher.qml b/examples/declarative/particles/exampleslauncher.qml
index c08123c..354bcdf 100644
--- a/examples/declarative/particles/exampleslauncher.qml
+++ b/examples/declarative/particles/exampleslauncher.qml
@@ -52,8 +52,6 @@ Rectangle{
         id: shell
         anchors.fill: parent
     }
-    property string emissionMode: "Falling"
-    onEmissionModeChanged: workaround.active = true
     VisualDataModel{//TODO: Transitions between modes
         id: vdm
         model: [
@@ -111,72 +109,8 @@ Rectangle{
     }
     GridView{
         anchors.fill: parent
-        anchors.bottomMargin: 128
+        cellWidth: 120
+        cellHeight: 120
         model: vdm
-        visible: emissionMode == "Grid"
-        opacity: visible?1:0
-        Behavior on opacity{NumberAnimation{}}
-    }
-    ParticleSystem{ id: sys }
-    ModelParticle{
-        system: sys
-        model: vdm
-    }
-    Kill{
-        //TODO: File bug?
-        id: workaround
-        system: sys
-        active: false
-        onActiveChanged: timer.start()
-        Timer{
-            id: timer
-            interval: 32
-            running: false
-            repeat: false
-            onTriggered: workaround.active = false
-        }
-    }
-    Emitter{
-        system: sys
-        emitting: emissionMode == "Falling"
-        width: parent.width
-        particlesPerSecond: 2
-        particleDuration: 6000
-        speed: PointDirection{y:100;}
-    }
-    Emitter{
-        system: sys
-        emitting: emissionMode == "Bursting"
-        anchors.centerIn: parent
-        particlesPerSecond: 2
-        particleDuration: 6000
-        speed: AngledDirection{magnitude: 60; angleVariation: 360}
-    }
-    Emitter{
-        system: sys
-        emitting: emissionMode == "Shimmering"
-        anchors.fill: parent
-        particlesPerSecond: 4
-        particleDuration: 4000
-    }
-    Row{
-        anchors.bottom: parent.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-        Button{
-            text:"Grid"
-            onClicked: emissionMode = "Grid";
-        }
-        Button{
-            text:"Fall"
-            onClicked: emissionMode = "Falling";
-        }
-        Button{
-            text:"Burst"
-            onClicked: emissionMode = "Bursting";
-        }
-        Button{
-            text:"Shimmer"
-            onClicked: emissionMode = "Shimmering";
-        }
     }
 }
diff --git a/examples/declarative/particles/modelparticles/bubbles.qml b/examples/declarative/particles/modelparticles/bubbles.qml
index d0eb3ea..23f0b82 100644
--- a/examples/declarative/particles/modelparticles/bubbles.qml
+++ b/examples/declarative/particles/modelparticles/bubbles.qml
@@ -63,8 +63,8 @@ Item{
         x: parent.width/4
         y:parent.height
         speed: PointDirection{ y: -64; yVariation: 16 }
-        particlesPerSecond: 1
-        particleDuration: 8000
+        emitRate: 1
+        lifeSpan: 8000
     }
     Wander{
         system: sys
diff --git a/examples/declarative/particles/modelparticles/gridsplosion.qml b/examples/declarative/particles/modelparticles/gridsplosion.qml
index fe2dd26..db86012 100644
--- a/examples/declarative/particles/modelparticles/gridsplosion.qml
+++ b/examples/declarative/particles/modelparticles/gridsplosion.qml
@@ -52,9 +52,9 @@ Item{
         system: sys
         id: burster;
         emitting: false
-        particlesPerSecond: 1000
-        particleDuration: 50000
-        maxParticles: 100;
+        emitRate: 1000
+        lifeSpan: 50000
+        emitCap: 100;
         speed: PointDirection{xVariation: 400; yVariation: 400}
         anchors.centerIn: parent
         Timer{
@@ -72,7 +72,7 @@ Item{
     }
     ImageParticle{
         system: sys
-        image: "../trails/content/particle.png"
+        source: "../trails/content/particle.png"
         color: "black"
         colorVariation: 0.0
     }
diff --git a/examples/declarative/particles/modelparticles/package.qml b/examples/declarative/particles/modelparticles/package.qml
index 6487380..0aa8903 100644
--- a/examples/declarative/particles/modelparticles/package.qml
+++ b/examples/declarative/particles/modelparticles/package.qml
@@ -85,7 +85,7 @@ Rectangle {
         width: 100
         x: 50
         speed: PointDirection{ y: 40 }
-        particleDuration: 5000
-        particlesPerSecond: 1.6
+        lifeSpan: 5000
+        emitRate: 1.6
     }
 }
diff --git a/examples/declarative/particles/modelparticles/stream.qml b/examples/declarative/particles/modelparticles/stream.qml
index 73107ad..5c7a6f7 100644
--- a/examples/declarative/particles/modelparticles/stream.qml
+++ b/examples/declarative/particles/modelparticles/stream.qml
@@ -75,8 +75,8 @@ Item{
         x: -132/2
         y: 132/2
         speed: PointDirection{ x: 32; xVariation: 8 }
-        particlesPerSecond: 0.5
-        particleDuration: 120000 //TODO: A -1 or something which does 'infinite'? (but need disable fade first)
+        emitRate: 0.5
+        lifeSpan: 120000 //TODO: A -1 or something which does 'infinite'? (but need disable fade first)
         particle: "photos"
     }
     Kill{
@@ -88,7 +88,7 @@ Item{
     ImageParticle{
         system: sys
         particles: ["fireworks"]
-        image: "../trails/content/star.png"
+        source: "../trails/content/star.png"
         color: "lightsteelblue"
         alpha: 0
         colorVariation: 0
@@ -163,9 +163,9 @@ Item{
     Emitter{
         id: centerEmitter
         speed: PointDirection{ x: 32; xVariation: 8;}
-        particlesPerSecond: 0.5
-        particleDuration: 12000 //TODO: A -1 or something which does 'infinite'? (but need disable fade first)
-        maxParticles: 20
+        emitRate: 0.5
+        lifeSpan: 12000 //TODO: A -1 or something which does 'infinite'? (but need disable fade first)
+        emitCap: 20
         particle: "photos"
         system: sys
         anchors.centerIn: parent
@@ -177,16 +177,16 @@ Item{
         id: spawnFireworks
         particle: "fireworks"
         system: sys
-        maxParticles: 400
-        particlesPerSecond: 400
-        particleDuration: 2800
+        emitCap: 400
+        emitRate: 400
+        lifeSpan: 2800
         x: parent.width/2
         y: parent.height/2 - 64
         width: 8
         height: 8
         emitting: false
-        particleSize: 32
-        particleEndSize: 8
+        size: 32
+        endSize: 8
         speed: AngledDirection{ magnitude: 160; magnitudeVariation: 120; angleVariation: 90; angle: 270 }
         acceleration: PointDirection{ y: 160 }
     }
diff --git a/examples/declarative/particles/snow/snow.qml b/examples/declarative/particles/snow/snow.qml
index 41adccf..ea2de17 100644
--- a/examples/declarative/particles/snow/snow.qml
+++ b/examples/declarative/particles/snow/snow.qml
@@ -65,13 +65,13 @@ Rectangle{
     }
     Emitter {
         system: particles
-        particlesPerSecond: 20
-        particleDuration: 7000
+        emitRate: 20
+        lifeSpan: 7000
         emitting: true
         speed: PointDirection{ y:80; yVariation: 40; }
         acceleration: PointDirection{ y: 4 }
-        particleSize: 20
-        particleSizeVariation: 10
+        size: 20
+        sizeVariation: 10
         width: parent.width
         height: 100
     }
diff --git a/examples/declarative/particles/spaceexplorer/spaceexplorer.qml b/examples/declarative/particles/spaceexplorer/spaceexplorer.qml
index f303bb4..1bb3cda 100644
--- a/examples/declarative/particles/spaceexplorer/spaceexplorer.qml
+++ b/examples/declarative/particles/spaceexplorer/spaceexplorer.qml
@@ -78,11 +78,11 @@ Rectangle{
     Emitter{
         particle: "stars2"
         system: background
-        particlesPerSecond: 60
-        particleDuration: 4000
+        emitRate: 60
+        lifeSpan: 4000
         emitting: true
-        particleSize: 10
-        particleSizeVariation: 10
+        size: 10
+        sizeVariation: 10
         anchors.fill: parent
     }
     ParticleSystem{ id: background }
@@ -90,7 +90,7 @@ Rectangle{
         particles: ["stars2"]
         system: background
         anchors.fill: parent
-        image: "content/star.png"
+        source: "content/star.png"
         color: "white"
         colorVariation: 0.1
     }
@@ -201,7 +201,7 @@ Rectangle{
         particles: ["stars"]
         anchors.fill: parent
         system: foreground
-        image: "content/star.png"
+        source: "content/star.png"
         color: "white"
         colorVariation: 0.1
     }
@@ -209,7 +209,7 @@ Rectangle{
         particles: ["shot"]
         anchors.fill: parent
         system: foreground
-        image: "content/star.png"
+        source: "content/star.png"
 
         color: "orange"
         colorVariation: 0.3
@@ -219,7 +219,7 @@ Rectangle{
         particles: ["engine"]
         anchors.fill: parent
         system: foreground
-        image: "content/particle4.png"
+        source: "content/particle4.png"
 
         color: "orange"
         SequentialAnimation on color {
@@ -327,21 +327,21 @@ Rectangle{
     Emitter{
         particle: "powerups"
         system: foreground
-        particlesPerSecond: 1
-        particleDuration: 6000
+        emitRate: 1
+        lifeSpan: 6000
         emitting: !gameOver
-        particleSize: 60
-        particleSizeVariation: 10
+        size: 60
+        sizeVariation: 10
         anchors.fill: parent
     }
     Emitter{
         particle: "stars"
         system: foreground
-        particlesPerSecond: 40
-        particleDuration: 4000
+        emitRate: 40
+        lifeSpan: 4000
         emitting: !gameOver
-        particleSize: 30
-        particleSizeVariation: 10
+        size: 30
+        sizeVariation: 10
         anchors.fill: parent
     }
     SpriteImage{
@@ -382,12 +382,12 @@ Rectangle{
         Emitter{
             system: foreground
             particle: "engine"
-            particlesPerSecond: 100
-            particleDuration: 1000
+            emitRate: 100
+            lifeSpan: 1000
             emitting: !gameOver 
-            particleSize: 10
-            particleEndSize: 4
-            particleSizeVariation: 4
+            size: 10
+            endSize: 4
+            sizeVariation: 4
             speed: PointDirection{
                 x: -128 * Math.cos(rocket.rotation * (Math.PI / 180))
                 y: -128 * Math.sin(rocket.rotation * (Math.PI / 180))
@@ -400,10 +400,10 @@ Rectangle{
         Emitter{
             system: foreground
             particle: "shot"
-            particlesPerSecond: 16
-            particleDuration: 1600
+            emitRate: 16
+            lifeSpan: 1600
             emitting: !gameOver && shoot
-            particleSize: 40
+            size: 40
             speed: PointDirection{
                 x: 256 * Math.cos(rocket.rotation * (Math.PI / 180))
                 y: 256 * Math.sin(rocket.rotation * (Math.PI / 180))
diff --git a/examples/declarative/particles/trails/dynamicemitters.qml b/examples/declarative/particles/trails/dynamicemitters.qml
index 8e55503..588474f 100644
--- a/examples/declarative/particles/trails/dynamicemitters.qml
+++ b/examples/declarative/particles/trails/dynamicemitters.qml
@@ -51,7 +51,7 @@ Rectangle{
     }
     ImageParticle{
         system: sys
-        image: "content/particle.png"
+        source: "content/particle.png"
         color: "white"
         colorVariation: 1.0
         alpha: 0.1
@@ -64,10 +64,10 @@ Rectangle{
                 id: emitMore
                 system: sys
                 emitting: true
-                particlesPerSecond: 128
-                particleDuration: 600
-                particleSize: 16
-                particleEndSize: 8
+                emitRate: 128
+                lifeSpan: 600
+                size: 16
+                endSize: 8
                 speed: AngledDirection{angleVariation:360; magnitude: 60}
             }
 
@@ -81,10 +81,10 @@ Rectangle{
             }
             system: sys
             emitting: true
-            particlesPerSecond: 64
-            particleDuration: 600
-            particleSize: 24
-            particleEndSize: 8
+            emitRate: 64
+            lifeSpan: 600
+            size: 24
+            endSize: 8
             NumberAnimation on x{
                 id: xAnim;
                 to: targetX
diff --git a/examples/declarative/particles/trails/fireballs.qml b/examples/declarative/particles/trails/fireballs.qml
index cd81168..4cc2eac 100644
--- a/examples/declarative/particles/trails/fireballs.qml
+++ b/examples/declarative/particles/trails/fireballs.qml
@@ -57,7 +57,7 @@ Rectangle {
         anchors.fill: parent
         particles: ["E"]
         system: particles
-        image: "content/particleA.png"
+        source: "content/particleA.png"
         colorVariation: 0.2
         color: "#00ff400f"
     }
@@ -67,7 +67,7 @@ Rectangle {
         system: particles
         anchors.fill: parent
         particles: ["A", "B"]
-        image: "content/particle.png"
+        source: "content/particle.png"
         colorVariation: 0
         color: "#00111111"
     }
@@ -76,7 +76,7 @@ Rectangle {
         anchors.fill: parent
         system: particles
         particles: ["C", "D"]
-        image: "content/particle.png"
+        source: "content/particle.png"
         colorVariation: 0.1
         color: "#00ff400f"
     }
@@ -88,15 +88,15 @@ Rectangle {
         y: parent.height
         width: parent.width
 
-        particlesPerSecond: 350
-        particleDuration: 3500
+        emitRate: 350
+        lifeSpan: 3500
 
         acceleration: PointDirection{ y: -17; xVariation: 3 }
         speed: PointDirection{xVariation: 3}
 
-        particleSize: 24
-        particleSizeVariation: 8
-        particleEndSize: 4
+        size: 24
+        sizeVariation: 8
+        endSize: 4
     }
     FollowEmitter{
         id: fireSmoke
@@ -106,15 +106,15 @@ Rectangle {
         width: root.width
         height: root.height - 68
 
-        particlesPerParticlePerSecond: 1
-        particleDuration: 2000
+        emitRatePerParticle: 1
+        lifeSpan: 2000
 
         speed: PointDirection{y:-17*6; yVariation: -17; xVariation: 3}
         acceleration: PointDirection{xVariation: 3}
 
-        particleSize: 36
-        particleSizeVariation: 8
-        particleEndSize: 16
+        size: 36
+        sizeVariation: 8
+        endSize: 16
     }
     FollowEmitter{
         id: fireballFlame
@@ -123,14 +123,14 @@ Rectangle {
         particle: "D"
         follow: "E"
 
-        particlesPerParticlePerSecond: 120
-        particleDuration: 180
-        emissionWidth: 8
-        emissionHeight: 8
+        emitRatePerParticle: 120
+        lifeSpan: 180
+        emitWidth: 8
+        emitHeight: 8
 
-        particleSize: 16
-        particleSizeVariation: 4
-        particleEndSize: 4
+        size: 16
+        sizeVariation: 4
+        endSize: 4
     }
     
     FollowEmitter{
@@ -140,17 +140,17 @@ Rectangle {
         particle: "A"
         follow: "E"
 
-        particlesPerParticlePerSecond: 128
-        particleDuration: 2400
-        emissionWidth: 16
-        emissionHeight: 16
+        emitRatePerParticle: 128
+        lifeSpan: 2400
+        emitWidth: 16
+        emitHeight: 16
 
         speed: PointDirection{yVariation: 16; xVariation: 16}
         acceleration: PointDirection{y: -16}
 
-        particleSize: 24
-        particleSizeVariation: 8
-        particleEndSize: 8
+        size: 24
+        sizeVariation: 8
+        endSize: 8
     }
     Emitter{
         id: balls
@@ -160,14 +160,14 @@ Rectangle {
         y: parent.height
         width: parent.width
 
-        particlesPerSecond: 2
-        particleDuration: 7000
+        emitRate: 2
+        lifeSpan: 7000
 
         speed: PointDirection{y:-17*4*2; xVariation: 6*6}
         acceleration: PointDirection{y: 17*2; xVariation: 6*6}
 
-        particleSize: 12
-        particleSizeVariation: 4
+        size: 12
+        sizeVariation: 4
     }
 
 }
diff --git a/examples/declarative/particles/trails/layered.qml b/examples/declarative/particles/trails/layered.qml
index b2895dd..d4a823b 100644
--- a/examples/declarative/particles/trails/layered.qml
+++ b/examples/declarative/particles/trails/layered.qml
@@ -59,20 +59,20 @@ Rectangle{
         system: sys
         y:root.height + 20
         width: root.width
-        particlesPerSecond: 200
-        particleDuration: 4000
+        emitRate: 200
+        lifeSpan: 4000
         speed: PointDirection{ y: -120; }
     }
     ImageParticle{
         system: sys
         visible: !cloneMode
-        image: "content/particle2.png"
+        source: "content/particle2.png"
     }
     ImageParticle{
         system: sys
         visible: cloneMode
         z: 0
-        image: "content/particle3.png"
+        source: "content/particle3.png"
     }
     ImageParticle{
         system: sys
@@ -82,6 +82,6 @@ Rectangle{
         height: 240
         width: root.width
         z: 1
-        image: "content/particle.png"
+        source: "content/particle.png"
     }
 }
diff --git a/examples/declarative/particles/trails/list.qml b/examples/declarative/particles/trails/list.qml
index 7874590..7e8fb44 100644
--- a/examples/declarative/particles/trails/list.qml
+++ b/examples/declarative/particles/trails/list.qml
@@ -54,7 +54,7 @@ Rectangle {
         anchors.fill: parent
         system: particles
         z: 10
-        image: "content/star.png"
+        source: "content/star.png"
         color: "white"
         colorVariation: 0.0
     }
@@ -96,10 +96,10 @@ Rectangle {
                 anchors.fill: parent
                 system: particles;
                 emitting: anim.running
-                particlesPerSecond: 600
-                particleDuration: 600
-                particleSize: 16
-                particleEndSize: 8
+                emitRate: 600
+                lifeSpan: 600
+                size: 16
+                endSize: 8
             }
         }
     }
diff --git a/examples/declarative/particles/trails/overburst.qml b/examples/declarative/particles/trails/overburst.qml
index ed9313d..c3129a1 100644
--- a/examples/declarative/particles/trails/overburst.qml
+++ b/examples/declarative/particles/trails/overburst.qml
@@ -49,7 +49,7 @@ Rectangle{
     ImageParticle{
         system: sys
         id: cp
-        image: "content/particle.png"
+        source: "content/particle.png"
         colorVariation: 0.4
         color: "#000000FF"
     }
@@ -60,13 +60,13 @@ Rectangle{
         emitting: ma.pressed
         x: ma.mouseX
         y: ma.mouseY
-        particlesPerSecond: 16000
-        particleDuration: 1000
-        maxParticles: 4000
+        emitRate: 16000
+        lifeSpan: 1000
+        emitCap: 4000
         acceleration: AngledDirection{angleVariation: 360; magnitude: 360; }
-        particleSize: 8
-        particleEndSize: 16
-        particleSizeVariation: 4
+        size: 8
+        endSize: 16
+        sizeVariation: 4
     }
     MouseArea{
         anchors.fill: parent
diff --git a/examples/declarative/particles/trails/portal.qml b/examples/declarative/particles/trails/portal.qml
index ae9b447..8cf323b 100644
--- a/examples/declarative/particles/trails/portal.qml
+++ b/examples/declarative/particles/trails/portal.qml
@@ -58,7 +58,7 @@ Rectangle{
         particles: ["center","edge"]
         anchors.fill: parent
         system: particles
-        image: "content/particle.png"
+        source: "content/particle.png"
         colorVariation: 0.1
         color: "#009999FF"
     }
@@ -66,12 +66,12 @@ Rectangle{
         anchors.fill: parent
         particle: "center"
         system: particles
-        particlesPerSecond: 200
-        particleDuration: 2000
+        emitRate: 200
+        lifeSpan: 2000
         emitting: true
-        particleSize: 20
-        particleSizeVariation: 2
-        particleEndSize: 0
+        size: 20
+        sizeVariation: 2
+        endSize: 0
         shape: EllipseShape{fill: false}
         speed: TargetedDirection{
             targetX: root.width/2 
@@ -84,12 +84,12 @@ Rectangle{
         anchors.fill: parent
         particle: "edge"
         system: particles
-        particlesPerSecond: 4000
-        particleDuration: 2000
+        emitRate: 4000
+        lifeSpan: 2000
         emitting: true
-        particleSize: 20
-        particleSizeVariation: 2
-        particleEndSize: 0
+        size: 20
+        sizeVariation: 2
+        endSize: 0
         shape: EllipseShape{fill: false}
         speed: TargetedDirection{
             targetX: root.width/2 
diff --git a/examples/declarative/particles/trails/rainbow.qml b/examples/declarative/particles/trails/rainbow.qml
index 543a9b6..c0b61bf 100644
--- a/examples/declarative/particles/trails/rainbow.qml
+++ b/examples/declarative/particles/trails/rainbow.qml
@@ -53,14 +53,14 @@ Rectangle {
         colorVariation: 0.5
         alpha: 0
 
-        image: "content/particle.png"
+        source: "content/particle.png"
         colorTable: "content/colortable.png"
         sizeTable: "content/colortable.png"
     }
     Emitter{
         system: particles
-        particlesPerSecond: 500
-        particleDuration: 2000
+        emitRate: 500
+        lifeSpan: 2000
 
         y: root.height / 2 + Math.sin(t * 2) * root.height * 0.3
         x: root.width / 2 + Math.cos(t) * root.width * 0.3
@@ -75,8 +75,8 @@ Rectangle {
         speed: PointDirection{ xVariation: 5; yVariation: 5;}
         acceleration: PointDirection{ xVariation: 5; yVariation: 5;}
 
-        particleSize: 16
-        //particleEndSize: 8
-        //particleSizeVariation: 8
+        size: 16
+        //endSize: 8
+        //sizeVariation: 8
     }
 }
diff --git a/examples/declarative/particles/trails/shimmer.qml b/examples/declarative/particles/trails/shimmer.qml
index b3157f6..2bd4f69 100644
--- a/examples/declarative/particles/trails/shimmer.qml
+++ b/examples/declarative/particles/trails/shimmer.qml
@@ -56,7 +56,7 @@ Rectangle{
     ImageParticle{
         anchors.fill: parent
         system: particles
-        image: "content/star.png"
+        source: "content/star.png"
         sizeTable: "content/sparkleSize.png"
         alpha: 0
         colorVariation: 0.6
@@ -64,10 +64,10 @@ Rectangle{
     Emitter{
         anchors.fill: parent
         system: particles
-        particlesPerSecond: 2000
-        particleDuration: 2000
+        emitRate: 2000
+        lifeSpan: 2000
         emitting: true
-        particleSize: 30
-        particleSizeVariation: 10
+        size: 30
+        sizeVariation: 10
     }
 }
diff --git a/examples/declarative/particles/trails/trails.qml b/examples/declarative/particles/trails/trails.qml
index 6ee8a6e..689de4e 100644
--- a/examples/declarative/particles/trails/trails.qml
+++ b/examples/declarative/particles/trails/trails.qml
@@ -49,7 +49,7 @@ Rectangle{
     ImageParticle{
         system: sys
         id: cp
-        image: "content/particle.png"
+        source: "content/particle.png"
         color: "#00FFFFFF"
         colorVariation: 0.4
     }
@@ -58,12 +58,12 @@ Rectangle{
         id: bursty
         system: sys
         emitting: false
-        particlesPerSecond: 2000
-        particleDuration: 500
+        emitRate: 2000
+        lifeSpan: 500
         acceleration: AngledDirection{ angle: 90; angleVariation: 360; magnitude: 640; }
-        particleSize: 8
-        particleEndSize: 16
-        particleSizeVariation: 4
+        size: 8
+        endSize: 16
+        sizeVariation: 4
     }
     Emitter{
         system: sys
@@ -71,12 +71,12 @@ Rectangle{
         emitting: ma.pressed
         x: ma.mouseX
         y: ma.mouseY
-        particlesPerSecond: 400
-        particleDuration: 2000
+        emitRate: 400
+        lifeSpan: 2000
         acceleration: AngledDirection{ angle: 90; angleVariation: 22; magnitude: 32; }
-        particleSize: 8
-        particleEndSize: 16
-        particleSizeVariation: 8
+        size: 8
+        endSize: 16
+        sizeVariation: 8
     }
     MouseArea{
         id: ma
diff --git a/examples/declarative/particles/trails/turbulence.qml b/examples/declarative/particles/trails/turbulence.qml
index bde25bc..6159b3e 100644
--- a/examples/declarative/particles/trails/turbulence.qml
+++ b/examples/declarative/particles/trails/turbulence.qml
@@ -69,14 +69,14 @@ Rectangle{
     ImageParticle{
         particles: ["smoke"]
         system: ps
-        image: "content/particle.png"
+        source: "content/particle.png"
         color: "#11111111"
         colorVariation: 0
     }
     ImageParticle{
         particles: ["flame"]
         system: ps
-        image: "content/particle.png"
+        source: "content/particle.png"
         color: "#11ff400f"
         colorVariation: 0.1
         }
@@ -85,11 +85,11 @@ Rectangle{
         system: ps
         particle: "flame"
         
-        particlesPerSecond: 120
-        particleDuration: 1200
-        particleSize: 20
-        particleEndSize: 10
-        particleSizeVariation: 10
+        emitRate: 120
+        lifeSpan: 1200
+        size: 20
+        endSize: 10
+        sizeVariation: 10
         acceleration: PointDirection{ y: -40 }
         speed: AngledDirection{ angle: 270; magnitude: 20; angleVariation: 22; magnitudeVariation: 5 }
     }
@@ -101,12 +101,12 @@ Rectangle{
         particle: "smoke"
         follow: "flame"
 
-        particlesPerParticlePerSecond: 4
-        particleDuration: 2400
-        particleDurationVariation: 400
-        particleSize: 16
-        particleEndSize: 8
-        particleSizeVariation: 8
+        emitRatePerParticle: 4
+        lifeSpan: 2400
+        lifeSpanVariation: 400
+        size: 16
+        endSize: 8
+        sizeVariation: 8
         acceleration: PointDirection{ y: -40 }
         speed: AngledDirection{ angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
     }
@@ -118,11 +118,11 @@ Rectangle{
         particle: "smoke"
         follow: "flame"
         
-        particlesPerParticlePerSecond: 1
-        particleDuration: 2400
-        particleSize: 36
-        particleEndSize: 24
-        particleSizeVariation: 8
+        emitRatePerParticle: 1
+        lifeSpan: 2400
+        size: 36
+        endSize: 24
+        sizeVariation: 8
         acceleration: PointDirection{ y: -40 }
         speed: AngledDirection{ angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
     }
diff --git a/examples/declarative/particles/trails/velocityfrommotion.qml b/examples/declarative/particles/trails/velocityfrommotion.qml
index d2e4ed2..d361c99 100644
--- a/examples/declarative/particles/trails/velocityfrommotion.qml
+++ b/examples/declarative/particles/trails/velocityfrommotion.qml
@@ -77,7 +77,7 @@ Rectangle {
     ParticleSystem{ id: sys1 }
     ImageParticle{
         system: sys1
-        image: "content/particle.png"
+        source: "content/particle.png"
         color: "cyan"
         alpha: 0
         SequentialAnimation on color {
@@ -109,8 +109,8 @@ Rectangle {
         id: trailsNormal
         system: sys1
 
-        particlesPerSecond: 500
-        particleDuration: 2000
+        emitRate: 500
+        lifeSpan: 2000
 
 
         y: mouseArea.pressed ? mouseArea.mouseY : circle.cy
@@ -120,8 +120,8 @@ Rectangle {
         acceleration: PointDirection{xVariation: 10; yVariation: 10;}
         speedFromMovement: 8
 
-        particleSize: 8
-        particleSizeVariation: 4
+        size: 8
+        sizeVariation: 4
     }
     ParticleSystem { id: sys2 }
     ImageParticle{
@@ -142,14 +142,14 @@ Rectangle {
             }
         }
         colorVariation: 0.5
-        image: "content/star.png"
+        source: "content/star.png"
     }
     Emitter{
         id: trailsStars
         system: sys2
 
-        particlesPerSecond: 100
-        particleDuration: 2200
+        emitRate: 100
+        lifeSpan: 2200
 
 
         y: mouseArea.pressed ? mouseArea.mouseY : circle.cy
@@ -159,12 +159,12 @@ Rectangle {
         acceleration: PointDirection{xVariation: 10; yVariation: 10;}
         speedFromMovement: 8
 
-        particleSize: 22
-        particleSizeVariation: 4
+        size: 22
+        sizeVariation: 4
     }
     ParticleSystem { id: sys3; }
     ImageParticle{
-        image: "content/particle.png"
+        source: "content/particle.png"
         system: sys3
         color: "orange"
         alpha: 0
@@ -189,8 +189,8 @@ Rectangle {
         id: trailsNormal2
         system: sys3
 
-        particlesPerSecond: 300
-        particleDuration: 2000
+        emitRate: 300
+        lifeSpan: 2000
 
         y: mouseArea.pressed ? mouseArea.mouseY : circle2.cy
         x: mouseArea.pressed ? mouseArea.mouseX : circle2.cx
@@ -200,13 +200,13 @@ Rectangle {
         speed: PointDirection{xVariation: 4; yVariation: 4;}
         acceleration: PointDirection{xVariation: 10; yVariation: 10;}
 
-        particleSize: 12
-        particleSizeVariation: 4
+        size: 12
+        sizeVariation: 4
     }
     ParticleSystem { id: sys4; }
     ImageParticle{
         system: sys4
-        image: "content/star.png"
+        source: "content/star.png"
         color: "green"
         alpha: 0
         SequentialAnimation on color {
@@ -229,8 +229,8 @@ Rectangle {
         id: trailsStars2
         system: sys4
 
-        particlesPerSecond: 50
-        particleDuration: 2200
+        emitRate: 50
+        lifeSpan: 2200
 
 
         y: mouseArea.pressed ? mouseArea.mouseY : circle2.cy
@@ -240,8 +240,8 @@ Rectangle {
         speed: PointDirection{xVariation: 2; yVariation: 2;}
         acceleration: PointDirection{xVariation: 10; yVariation: 10;}
 
-        particleSize: 22
-        particleSizeVariation: 4
+        size: 22
+        sizeVariation: 4
     }
 
 
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.qml b/examples/declarative/toys/dynamicscene/dynamicscene.qml
index a436b41..1742047 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.qml
+++ b/examples/declarative/toys/dynamicscene/dynamicscene.qml
@@ -147,27 +147,27 @@ Item {
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "Sun.qml"
-                        image: "../images/sun.png"
+                        source: "../images/sun.png"
                     }
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "GenericSceneItem.qml"
-                        image: "../images/moon.png"
+                        source: "../images/moon.png"
                     }
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "PerspectiveItem.qml"
-                        image: "../images/tree_s.png"
+                        source: "../images/tree_s.png"
                     }
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "PerspectiveItem.qml"
-                        image: "../images/rabbit_brown.png"
+                        source: "../images/rabbit_brown.png"
                     }
                     PaletteItem {
                         anchors.verticalCenter: parent.verticalCenter
                         componentFile: "PerspectiveItem.qml"
-                        image: "../images/rabbit_bw.png"
+                        source: "../images/rabbit_bw.png"
                     }
                 }
             }
diff --git a/examples/declarative/toys/dynamicscene/qml/Sun.qml b/examples/declarative/toys/dynamicscene/qml/Sun.qml
index d632461..df3246d 100644
--- a/examples/declarative/toys/dynamicscene/qml/Sun.qml
+++ b/examples/declarative/toys/dynamicscene/qml/Sun.qml
@@ -44,7 +44,7 @@ Image {
     id: sun
 
     property bool created: false
-    property string image: "../images/sun.png"
+    property string source: "../images/sun.png"
 
     source: image
 
diff --git a/examples/declarative/ui-components/flipable/content/Card.qml b/examples/declarative/ui-components/flipable/content/Card.qml
index 6374dd8..6574733 100644
--- a/examples/declarative/ui-components/flipable/content/Card.qml
+++ b/examples/declarative/ui-components/flipable/content/Card.qml
@@ -43,7 +43,7 @@ import QtQuick 1.0
 Flipable {
     id: container
 
-    property alias image: frontImage.source
+    property alias source: frontImage.source
     property bool flipped: true
     property int xAxis: 0
     property int yAxis: 0
diff --git a/examples/declarative/ui-components/flipable/flipable.qml b/examples/declarative/ui-components/flipable/flipable.qml
index 6d0235e..3b23aa0 100644
--- a/examples/declarative/ui-components/flipable/flipable.qml
+++ b/examples/declarative/ui-components/flipable/flipable.qml
@@ -49,7 +49,7 @@ Rectangle {
 
     Row {
         anchors.centerIn: parent; spacing: 30
-        Card { image: "content/9_club.png"; angle: 180; yAxis: 1 }
-        Card { image: "content/5_heart.png"; angle: 540; xAxis: 1 }
+        Card { source: "content/9_club.png"; angle: 180; yAxis: 1 }
+        Card { source: "content/5_heart.png"; angle: 540; xAxis: 1 }
     }
 }
diff --git a/src/declarative/particles/qsgfollowemitter_p.h b/src/declarative/particles/qsgfollowemitter_p.h
index 314bd4e..bf5d2fe 100644
--- a/src/declarative/particles/qsgfollowemitter_p.h
+++ b/src/declarative/particles/qsgfollowemitter_p.h
@@ -56,13 +56,13 @@ class QSGFollowEmitter : public QSGParticleEmitter
     Q_OBJECT
     Q_PROPERTY(QString follow READ follow WRITE setFollow NOTIFY followChanged)
     //### Remove, and just document that particles per second is per particle? But has count issues
-    Q_PROPERTY(int particlesPerParticlePerSecond READ particlesPerParticlePerSecond WRITE setParticlesPerParticlePerSecond NOTIFY particlesPerParticlePerSecondChanged)
+    Q_PROPERTY(int emitRatePerParticle READ particlesPerParticlePerSecond WRITE setParticlesPerParticlePerSecond NOTIFY particlesPerParticlePerSecondChanged)
 
     //TODO: Document that FollowEmitter's box is where it follows. It emits in a rect centered on the followed particle
     //TODO: A set of properties that can involve the particle size of the followed
-    Q_PROPERTY(QSGParticleExtruder* emissionShape READ emissonShape WRITE setEmissionShape NOTIFY emissionShapeChanged)
-    Q_PROPERTY(qreal emissionHeight READ emitterYVariation WRITE setEmitterYVariation NOTIFY emitterYVariationChanged)
-    Q_PROPERTY(qreal emissionWidth READ emitterXVariation WRITE setEmitterXVariation NOTIFY emitterXVariationChanged)
+    Q_PROPERTY(QSGParticleExtruder* emitShape READ emissonShape WRITE setEmissionShape NOTIFY emissionShapeChanged)
+    Q_PROPERTY(qreal emitHeight READ emitterYVariation WRITE setEmitterYVariation NOTIFY emitterYVariationChanged)
+    Q_PROPERTY(qreal emitWidth READ emitterXVariation WRITE setEmitterXVariation NOTIFY emitterXVariationChanged)
 
 public:
     explicit QSGFollowEmitter(QSGItem *parent = 0);
diff --git a/src/declarative/particles/qsgimageparticle_p.h b/src/declarative/particles/qsgimageparticle_p.h
index 1318647..c6ec4c2 100644
--- a/src/declarative/particles/qsgimageparticle_p.h
+++ b/src/declarative/particles/qsgimageparticle_p.h
@@ -130,7 +130,7 @@ struct IntermediateVertices {
 class QSGImageParticle : public QSGParticlePainter
 {
     Q_OBJECT
-    Q_PROPERTY(QUrl image READ image WRITE setImage NOTIFY imageChanged)
+    Q_PROPERTY(QUrl source READ image WRITE setImage NOTIFY imageChanged)
     Q_PROPERTY(QUrl colorTable READ colortable WRITE setColortable NOTIFY colortableChanged)
     Q_PROPERTY(QUrl sizeTable READ sizetable WRITE setSizetable NOTIFY sizetableChanged)
     Q_PROPERTY(QUrl opacityTable READ opacitytable WRITE setOpacitytable NOTIFY opacitytableChanged)
diff --git a/src/declarative/particles/qsgparticleemitter_p.h b/src/declarative/particles/qsgparticleemitter_p.h
index ad6a5f6..9fafd9d 100644
--- a/src/declarative/particles/qsgparticleemitter_p.h
+++ b/src/declarative/particles/qsgparticleemitter_p.h
@@ -66,14 +66,14 @@ class QSGParticleEmitter : public QSGItem
     Q_PROPERTY(QSGParticleExtruder* shape READ extruder WRITE setExtruder NOTIFY extruderChanged)
     Q_PROPERTY(bool emitting READ emitting WRITE setEmitting NOTIFY emittingChanged)
 
-    Q_PROPERTY(qreal particlesPerSecond READ particlesPerSecond WRITE setParticlesPerSecond NOTIFY particlesPerSecondChanged)
-    Q_PROPERTY(int particleDuration READ particleDuration WRITE setParticleDuration NOTIFY particleDurationChanged)
-    Q_PROPERTY(int particleDurationVariation READ particleDurationVariation WRITE setParticleDurationVariation NOTIFY particleDurationVariationChanged)
-    Q_PROPERTY(int maxParticles READ maxParticleCount WRITE setMaxParticleCount NOTIFY maxParticleCountChanged)
-
-    Q_PROPERTY(qreal particleSize READ particleSize WRITE setParticleSize NOTIFY particleSizeChanged)
-    Q_PROPERTY(qreal particleEndSize READ particleEndSize WRITE setParticleEndSize NOTIFY particleEndSizeChanged)
-    Q_PROPERTY(qreal particleSizeVariation READ particleSizeVariation WRITE setParticleSizeVariation NOTIFY particleSizeVariationChanged)
+    Q_PROPERTY(qreal emitRate READ particlesPerSecond WRITE setParticlesPerSecond NOTIFY particlesPerSecondChanged)
+    Q_PROPERTY(int lifeSpan READ particleDuration WRITE setParticleDuration NOTIFY particleDurationChanged)
+    Q_PROPERTY(int lifeSpanVariation READ particleDurationVariation WRITE setParticleDurationVariation NOTIFY particleDurationVariationChanged)
+    Q_PROPERTY(int emitCap READ maxParticleCount WRITE setMaxParticleCount NOTIFY maxParticleCountChanged)
+
+    Q_PROPERTY(qreal size READ particleSize WRITE setParticleSize NOTIFY particleSizeChanged)
+    Q_PROPERTY(qreal endSize READ particleEndSize WRITE setParticleEndSize NOTIFY particleEndSizeChanged)
+    Q_PROPERTY(qreal sizeVariation READ particleSizeVariation WRITE setParticleSizeVariation NOTIFY particleSizeVariationChanged)
 
     Q_PROPERTY(QSGStochasticDirection *speed READ speed WRITE setSpeed NOTIFY speedChanged)
     Q_PROPERTY(QSGStochasticDirection *acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged)