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.

33 files changed, 263 insertions, 329 deletions

diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
index e25b420025..f8f7b0ee55 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 1b456b0c5b..890a5782d1 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 9ce0e3a5e6..6b122e7be5 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 262644ec56..5b36eee3cd 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 1f385f2c20..f5479f1570 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 0818686e15..a599c69a63 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 e6aeaccea1..d6e13727ff 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 f2b6f8d163..0ea095deb6 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 223ea81205..2ecfc42a98 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 1bc406b00c..4a7ce02538 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 7d0f9cc6ac..8a3e9ad803 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 c08123cf44..354bcdf65a 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 d0eb3ea044..23f0b82d01 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 fe2dd261a5..db860125e5 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 64873802a5..0aa8903270 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 73107ad4f7..5c7a6f7fc4 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 41adccf7d7..ea2de17046 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 f303bb4d9a..1bb3cdae02 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 8e555033a0..588474fb43 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 cd81168d81..4cc2eacc25 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 b2895dd617..d4a823b556 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 7874590e28..7e8fb44003 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 ed9313d471..c3129a1d72 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 ae9b447fb9..8cf323b0f5 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 543a9b6182..c0b61bf89e 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 b3157f68cd..2bd4f6980f 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 6ee8a6ec37..689de4eb41 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 bde25bc472..6159b3e9c9 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 d2e4ed2917..d361c99f89 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 a436b41b88..174204768a 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 d632461262..df3246d356 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 6374dd8eda..6574733abb 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 6d0235ecb4..3b23aa0d69 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 }
     }
 }