Rename speed -> velocity in the particle system

Matches the convention set in the QtQuick module, for example by
ListView and Flickable.

Change-Id: I8df57ed1ced8128723d790c30c00cc1b2062787d
Reviewed-by: Bea Lam <bea.lam@nokia.com>

31 files changed, 72 insertions, 72 deletions

diff --git a/examples/demos/samegame/content/BoomBlock.qml b/examples/demos/samegame/content/BoomBlock.qml
index 0e3fff692f..b853341658 100644
--- a/examples/demos/samegame/content/BoomBlock.qml
+++ b/examples/demos/samegame/content/BoomBlock.qml
@@ -85,7 +85,7 @@ Item {
         }
         anchors.fill: parent
 
-        speed: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -60; magnitudeVariation: 60}
+        velocity: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -60; magnitudeVariation: 60}
         shape: EllipseShape{fill:true}
         enabled: false;
         lifeSpan: 700; lifeSpanVariation: 100
diff --git a/examples/particles/affectors/content/age.qml b/examples/particles/affectors/content/age.qml
index ba52ce25ec..bcc35a3880 100644
--- a/examples/particles/affectors/content/age.qml
+++ b/examples/particles/affectors/content/age.qml
@@ -64,7 +64,7 @@ Rectangle {
         system: particles
         emitRate: 20
         lifeSpan: 8000
-        speed: PointDirection { y:80; yVariation: 40; }
+        velocity: PointDirection { y:80; yVariation: 40; }
         acceleration: PointDirection { y: 4 }
         size: 36
         endSize: 12
diff --git a/examples/particles/affectors/content/attractor.qml b/examples/particles/affectors/content/attractor.qml
index 16a553faeb..71e66a046e 100644
--- a/examples/particles/affectors/content/attractor.qml
+++ b/examples/particles/affectors/content/attractor.qml
@@ -58,7 +58,7 @@ Rectangle {
         enabled: true
         size: 30
         sizeVariation: 10
-        speed: PointDirection { x: 220; xVariation: 40 }
+        velocity: PointDirection { x: 220; xVariation: 40 }
         height: parent.height
     }
     Emitter {
@@ -69,7 +69,7 @@ Rectangle {
         enabled: true
         size: 30
         sizeVariation: 10
-        speed: PointDirection { x: 220; xVariation: 40 }
+        velocity: PointDirection { x: 220; xVariation: 40 }
         height: parent.height
     }
     ParticleSystem {
@@ -178,7 +178,7 @@ Rectangle {
         size: 10
         endSize: 4
         sizeVariation: 4
-        speed: PointDirection { x: -128; xVariation: 32 }
+        velocity: PointDirection { x: -128; xVariation: 32 }
         height: ship.height
         y: ship.y
         x: ship.x
@@ -191,7 +191,7 @@ Rectangle {
         lifeSpan: 1000
         enabled: true
         size: 40
-        speed: PointDirection { x: 256; }
+        velocity: PointDirection { x: 256; }
         x: ship.x + ship.width
         y: ship.y + ship.height/2
     }
diff --git a/examples/particles/affectors/content/customaffector.qml b/examples/particles/affectors/content/customaffector.qml
index 2abb72dc16..8f634fbea3 100644
--- a/examples/particles/affectors/content/customaffector.qml
+++ b/examples/particles/affectors/content/customaffector.qml
@@ -58,7 +58,7 @@ Item {
         emitRate: 4
         lifeSpan: 14000
         size: 80
-        speed: PointDirection { y: 60 }
+        velocity: PointDirection { y: 60 }
     }
     Wander {
         system: sys
@@ -72,7 +72,7 @@ Item {
     Affector {
         system: sys
         property real coefficient: 0.1
-        property real speed: 1.5
+        property real velocity: 1.5
         width: parent.width
         height: parent.height - 100
         onAffectParticles: {
@@ -80,11 +80,11 @@ Item {
             if (particle.r == 0) {
                 particle.r = Math.random() > 0.5 ? -1 : 1;
             }else if (particle.r == 1) {
-                particle.rotation += speed * dt;
+                particle.rotation += velocity * dt;
                 if(particle.rotation >= maxAngle)
                     particle.r = -1;
             }else if (particle.r == -1) {
-                particle.rotation -= speed * dt;
+                particle.rotation -= velocity * dt;
                 if(particle.rotation <= -1 * maxAngle)
                     particle.r = 1;
             }
@@ -95,7 +95,7 @@ Item {
                 if (particle.r == 0.0) {
                     particle.r = Math.random() + 0.01;
                 }
-                particle.rotation += speed * particle.r * dt;
+                particle.rotation += velocity * particle.r * dt;
                 particle.r -= particle.rotation * coefficient;
                 if (particle.r == 0.0)
                     particle.r -= particle.rotation * 0.000001;
diff --git a/examples/particles/affectors/content/friction.qml b/examples/particles/affectors/content/friction.qml
index 951ffae2d3..bed1cf2a33 100644
--- a/examples/particles/affectors/content/friction.qml
+++ b/examples/particles/affectors/content/friction.qml
@@ -56,7 +56,7 @@ Item {
         emitRate: 4
         lifeSpan: 14000
         size: 80
-        speed: PointDirection { y: 160; yVariation: 80; xVariation: 20 }
+        velocity: PointDirection { y: 160; yVariation: 80; xVariation: 20 }
     }
 
     ImageParticle {
diff --git a/examples/particles/affectors/content/groupgoal.qml b/examples/particles/affectors/content/groupgoal.qml
index e874c78d89..977097dc29 100644
--- a/examples/particles/affectors/content/groupgoal.qml
+++ b/examples/particles/affectors/content/groupgoal.qml
@@ -111,7 +111,7 @@ Rectangle {
                 emitWidth: 16
                 emitHeight: 16
 
-                speed: PointDirection {yVariation: 16; xVariation: 16}
+                velocity: PointDirection {yVariation: 16; xVariation: 16}
                 acceleration: PointDirection {y: -16}
 
                 size: 24
@@ -152,7 +152,7 @@ Rectangle {
             lifeSpan: 4000//TODO: Infinite & kill zone
             size: 24
             sizeVariation: 4
-            speed: PointDirection {x:120; xVariation: 80; yVariation: 50}
+            velocity: PointDirection {x:120; xVariation: 80; yVariation: 50}
             acceleration: PointDirection {y:120}
             group: "unlit"
         }
@@ -167,7 +167,7 @@ Rectangle {
             size: 24
             sizeVariation: 2
             endSize: 0
-            speed: PointDirection { y:-100; yVariation: 4; xVariation: 4 }
+            velocity: PointDirection { y:-100; yVariation: 4; xVariation: 4 }
             // ![groupgoal-pilot]
             GroupGoal {
                 groups: ["unlit"]
diff --git a/examples/particles/affectors/content/move.qml b/examples/particles/affectors/content/move.qml
index 8ffe8e2d8b..d50def5cea 100644
--- a/examples/particles/affectors/content/move.qml
+++ b/examples/particles/affectors/content/move.qml
@@ -61,7 +61,7 @@ Rectangle {
             lifeSpan: 2800
             size: 32
             sizeVariation: 8
-            speed: PointDirection{ x: 66; xVariation: 20 }
+            velocity: PointDirection{ x: 66; xVariation: 20 }
             width: 80
             height: 80
         }
@@ -91,7 +91,7 @@ Rectangle {
             lifeSpan: 2800
             size: 32
             sizeVariation: 8
-            speed: PointDirection{ x: 240; xVariation: 60 }
+            velocity: PointDirection{ x: 240; xVariation: 60 }
             y: 260
             width: 10
             height: 10
@@ -105,7 +105,7 @@ Rectangle {
             width: 80
             height: 80
             once: true
-            speed: AngleDirection { angleVariation:360; magnitude: 72 }
+            velocity: AngleDirection { angleVariation:360; magnitude: 72 }
         }
         //! [B]
 
@@ -124,7 +124,7 @@ Rectangle {
             lifeSpan: 2800
             size: 32
             sizeVariation: 8
-            speed: PointDirection{ x: 80; xVariation: 10 }
+            velocity: PointDirection{ x: 80; xVariation: 10 }
             acceleration: PointDirection { y: 10; x: 20; }
             width: 80
             height: 80
diff --git a/examples/particles/affectors/content/spritegoal.qml b/examples/particles/affectors/content/spritegoal.qml
index 21aa859dac..0e5d94c515 100644
--- a/examples/particles/affectors/content/spritegoal.qml
+++ b/examples/particles/affectors/content/spritegoal.qml
@@ -81,7 +81,7 @@ Item {
 
         anchors.centerIn: parent
 
-        //acceleration: AngledDirection {angleVariation: 360; magnitude: 200}//Is this a better effect, more consistent speed?
+        //acceleration: AngledDirection {angleVariation: 360; magnitude: 200}//Is this a better effect, more consistent velocity?
         acceleration: PointDirection { xVariation: 200; yVariation: 200; }
 
         size: 0
@@ -203,8 +203,8 @@ Item {
         y: holder.y
         x: holder.x 
 
-        speed: PointDirection { xVariation: 40; yVariation: 40; }
-        speedFromMovement: 16
+        velocity: PointDirection { xVariation: 40; yVariation: 40; }
+        velocityFromMovement: 16
 
         acceleration: PointDirection { xVariation: 10; yVariation: 10; }
 
diff --git a/examples/particles/affectors/content/turbulence.qml b/examples/particles/affectors/content/turbulence.qml
index 823a37e547..62231e12ad 100644
--- a/examples/particles/affectors/content/turbulence.qml
+++ b/examples/particles/affectors/content/turbulence.qml
@@ -100,7 +100,7 @@ Rectangle {
         endSize: 10
         sizeVariation: 10
         acceleration: PointDirection { y: -40 }
-        speed: AngleDirection { angle: 270; magnitude: 20; angleVariation: 22; magnitudeVariation: 5 }
+        velocity: AngleDirection { angle: 270; magnitude: 20; angleVariation: 22; magnitudeVariation: 5 }
     }
     TrailEmitter {
         id: smoke1
@@ -117,7 +117,7 @@ Rectangle {
         endSize: 8
         sizeVariation: 8
         acceleration: PointDirection { y: -40 }
-        speed: AngleDirection { angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
+        velocity: AngleDirection { angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
     }
     TrailEmitter {
         id: smoke2
@@ -133,6 +133,6 @@ Rectangle {
         endSize: 24
         sizeVariation: 12
         acceleration: PointDirection { y: -40 }
-        speed: AngleDirection { angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
+        velocity: AngleDirection { angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
     }
 }
diff --git a/examples/particles/affectors/content/wander.qml b/examples/particles/affectors/content/wander.qml
index 649bfc06bb..931f3ab8d9 100644
--- a/examples/particles/affectors/content/wander.qml
+++ b/examples/particles/affectors/content/wander.qml
@@ -71,7 +71,7 @@ Rectangle {
         system: particles
         emitRate: 20
         lifeSpan: 7000
-        speed: PointDirection { y:80; yVariation: 40; }
+        velocity: PointDirection { y:80; yVariation: 40; }
         acceleration: PointDirection { y: 4 }
         size: 20
         sizeVariation: 10
diff --git a/examples/particles/customparticle/blurparticles.qml b/examples/particles/customparticle/blurparticles.qml
index 3d72425655..9b432e093d 100644
--- a/examples/particles/customparticle/blurparticles.qml
+++ b/examples/particles/customparticle/blurparticles.qml
@@ -53,7 +53,7 @@ Rectangle {
         height: parent.height
         emitRate: 1
         lifeSpan: 12000
-        speed: PointDirection {x:20;}
+        velocity: PointDirection {x:20;}
         size: 128
     }
     ShaderEffectSource {
diff --git a/examples/particles/customparticle/fragmentshader.qml b/examples/particles/customparticle/fragmentshader.qml
index 34acb1bd7c..367cc99b7b 100644
--- a/examples/particles/customparticle/fragmentshader.qml
+++ b/examples/particles/customparticle/fragmentshader.qml
@@ -63,7 +63,7 @@ ParticleSystem {
         lifeSpan: 8000
         size: 24
         sizeVariation: 16
-        speed: PointDirection {x: root.width/10; y: root.height/10;}
+        velocity: PointDirection {x: root.width/10; y: root.height/10;}
         //acceleration: AngledDirection {angle:225; magnitude: root.width/36; angleVariation: 45; magnitudeVariation: 80}
         acceleration: PointDirection {x: -root.width/40; y: -root.height/40; xVariation: -root.width/20; yVariation: -root.width/20}
     }
@@ -88,7 +88,7 @@ ParticleSystem {
 
                 highp vec2 pos = qt_ParticlePos
                 - currentSize / 2. + currentSize * qt_ParticleTex          // adjust size
-                + qt_ParticleVec.xy * t * qt_ParticleData.y         // apply speed vector..
+                + qt_ParticleVec.xy * t * qt_ParticleData.y         // apply velocity vector..
                 + 0.5 * qt_ParticleVec.zw * pow(t * qt_ParticleData.y, 2.);
 
                 gl_Position = qt_Matrix * vec4(pos.x, pos.y, 0, 1);
diff --git a/examples/particles/emitters/burstandpulse.qml b/examples/particles/emitters/burstandpulse.qml
index 1b1c2a60c9..c6d39b527d 100644
--- a/examples/particles/emitters/burstandpulse.qml
+++ b/examples/particles/emitters/burstandpulse.qml
@@ -77,7 +77,7 @@ Rectangle {
         emitRate: 2000
         lifeSpan: 2000
         enabled: false
-        speed: AngleDirection{magnitude: 64; angleVariation: 360}
+        velocity: AngleDirection{magnitude: 64; angleVariation: 360}
         size: 24
         sizeVariation: 8
     }
diff --git a/examples/particles/emitters/shapeanddirection.qml b/examples/particles/emitters/shapeanddirection.qml
index 43623427b6..3d378b8492 100644
--- a/examples/particles/emitters/shapeanddirection.qml
+++ b/examples/particles/emitters/shapeanddirection.qml
@@ -74,7 +74,7 @@ Rectangle {
         sizeVariation: 2
         endSize: 0
         shape: EllipseShape {fill: false}
-        speed: TargetDirection {
+        velocity: TargetDirection {
             targetX: root.width/2 
             targetY: root.height/2
             proportionalMagnitude: true
@@ -93,7 +93,7 @@ Rectangle {
         sizeVariation: 2
         endSize: 16
         shape: EllipseShape {fill: false}
-        speed: TargetDirection {
+        velocity: TargetDirection {
             targetX: root.width/2 
             targetY: root.height/2
             proportionalMagnitude: true
diff --git a/examples/particles/emitters/timedgroupchanges.qml b/examples/particles/emitters/timedgroupchanges.qml
index 699e7eb066..84e8cc0fa6 100644
--- a/examples/particles/emitters/timedgroupchanges.qml
+++ b/examples/particles/emitters/timedgroupchanges.qml
@@ -64,7 +64,7 @@ Rectangle {
                 lifeSpan: 1000
                 maximumEmitted: 1200
                 size: 8
-                speed: AngleDirection {angle: 270; angleVariation: 45; magnitude: 20; magnitudeVariation: 20;}
+                velocity: AngleDirection {angle: 270; angleVariation: 45; magnitude: 20; magnitudeVariation: 20;}
                 acceleration: PointDirection {y:100; yVariation: 20}
             }
         }
@@ -92,7 +92,7 @@ Rectangle {
             enabled: false
             emitRate: 80
             lifeSpan: 6000
-            speed: PointDirection {y:-100;}
+            velocity: PointDirection {y:-100;}
             size: 32
         }
 
@@ -104,7 +104,7 @@ Rectangle {
             lifeSpan: 1600
             maximumEmitted: 6400
             size: 8
-            speed: CumulativeDirection {
+            velocity: CumulativeDirection {
                 PointDirection {y:-100}
                 AngleDirection {angleVariation: 360; magnitudeVariation: 80;}
             }
diff --git a/examples/particles/emitters/trailemitter.qml b/examples/particles/emitters/trailemitter.qml
index e896329ca1..83b46e2d70 100644
--- a/examples/particles/emitters/trailemitter.qml
+++ b/examples/particles/emitters/trailemitter.qml
@@ -82,7 +82,7 @@ Rectangle {
         lifeSpan: 3500
 
         acceleration: PointDirection { y: -17; xVariation: 3 }
-        speed: PointDirection {xVariation: 3}
+        velocity: PointDirection {xVariation: 3}
 
         size: 24
         sizeVariation: 8
@@ -100,7 +100,7 @@ Rectangle {
         emitRatePerParticle: 1
         lifeSpan: 2000
 
-        speed: PointDirection {y:-17*6; yVariation: -17; xVariation: 3}
+        velocity: PointDirection {y:-17*6; yVariation: -17; xVariation: 3}
         acceleration: PointDirection {xVariation: 3}
 
         size: 36
@@ -139,7 +139,7 @@ Rectangle {
         emitHeight: TrailEmitter.ParticleSize
         emitShape: EllipseShape{}
 
-        speed: PointDirection {yVariation: 16; xVariation: 16}
+        velocity: PointDirection {yVariation: 16; xVariation: 16}
         acceleration: PointDirection {y: -16}
 
         size: 24
@@ -158,7 +158,7 @@ Rectangle {
         emitRate: 2
         lifeSpan: 7000
 
-        speed: PointDirection {y:-17*4*2; xVariation: 6*6}
+        velocity: PointDirection {y:-17*4*2; xVariation: 6*6}
         acceleration: PointDirection {y: 17*2; xVariation: 6*6}
 
         size: 8
diff --git a/examples/particles/emitters/velocityfrommotion.qml b/examples/particles/emitters/velocityfrommotion.qml
index 7ad2b4d6c4..ffca3c11b2 100644
--- a/examples/particles/emitters/velocityfrommotion.qml
+++ b/examples/particles/emitters/velocityfrommotion.qml
@@ -100,9 +100,9 @@ Rectangle {
         y: mouseArea.pressed ? mouseArea.mouseY : circle.cy
         x: mouseArea.pressed ? mouseArea.mouseX : circle.cx
 
-        speed: PointDirection {xVariation: 4; yVariation: 4;}
+        velocity: PointDirection {xVariation: 4; yVariation: 4;}
         acceleration: PointDirection {xVariation: 10; yVariation: 10;}
-        speedFromMovement: 8
+        velocityFromMovement: 8
 
         size: 8
         sizeVariation: 4
@@ -139,9 +139,9 @@ Rectangle {
         y: mouseArea.pressed ? mouseArea.mouseY : circle.cy
         x: mouseArea.pressed ? mouseArea.mouseX : circle.cx
 
-        speed: PointDirection {xVariation: 4; yVariation: 4;}
+        velocity: PointDirection {xVariation: 4; yVariation: 4;}
         acceleration: PointDirection {xVariation: 10; yVariation: 10;}
-        speedFromMovement: 8
+        velocityFromMovement: 8
 
         size: 22
         sizeVariation: 4
@@ -179,9 +179,9 @@ Rectangle {
         y: mouseArea.pressed ? mouseArea.mouseY : circle2.cy
         x: mouseArea.pressed ? mouseArea.mouseX : circle2.cx
 
-        speedFromMovement: 16
+        velocityFromMovement: 16
 
-        speed: PointDirection {xVariation: 4; yVariation: 4;}
+        velocity: PointDirection {xVariation: 4; yVariation: 4;}
         acceleration: PointDirection {xVariation: 10; yVariation: 10;}
 
         size: 12
@@ -220,8 +220,8 @@ Rectangle {
         y: mouseArea.pressed ? mouseArea.mouseY : circle2.cy
         x: mouseArea.pressed ? mouseArea.mouseX : circle2.cx
 
-        speedFromMovement: 16
-        speed: PointDirection {xVariation: 2; yVariation: 2;}
+        velocityFromMovement: 16
+        velocity: PointDirection {xVariation: 2; yVariation: 2;}
         acceleration: PointDirection {xVariation: 10; yVariation: 10;}
 
         size: 22
diff --git a/examples/particles/imageparticle/allatonce.qml b/examples/particles/imageparticle/allatonce.qml
index b62735d7f9..cedc17d7aa 100644
--- a/examples/particles/imageparticle/allatonce.qml
+++ b/examples/particles/imageparticle/allatonce.qml
@@ -59,7 +59,7 @@ Rectangle {
             }
         ]
         colorVariation: 0.5
-        rotationSpeedVariation: 360
+        rotationVelocityVariation: 360
         system: sys
         colorTable: "../trails/../images/colortable.png"
     }
@@ -75,7 +75,7 @@ Rectangle {
         id: particles
         emitRate: 200
         lifeSpan: 6000
-        speed: AngleDirection {angleVariation: 360; magnitude: 80; magnitudeVariation: 40}
+        velocity: AngleDirection {angleVariation: 360; magnitude: 80; magnitudeVariation: 40}
         size: 60
         endSize: 120
     }
diff --git a/examples/particles/imageparticle/colored.qml b/examples/particles/imageparticle/colored.qml
index ac760b6219..8ae9a8e0bc 100644
--- a/examples/particles/imageparticle/colored.qml
+++ b/examples/particles/imageparticle/colored.qml
@@ -75,7 +75,7 @@ Rectangle {
             lifeSpan: 2400
             size: 48
             sizeVariation: 8
-            speed: AngleDirection {angleVariation: 180; magnitude: 60}
+            velocity: AngleDirection {angleVariation: 180; magnitude: 60}
         }
 
         Turbulence {
diff --git a/examples/particles/imageparticle/colortable.qml b/examples/particles/imageparticle/colortable.qml
index 623029dae0..e7c9b5c176 100644
--- a/examples/particles/imageparticle/colortable.qml
+++ b/examples/particles/imageparticle/colortable.qml
@@ -72,9 +72,9 @@ Rectangle {
             from: 0; to: Math.PI * 2; duration: 10000; loops: Animation.Infinite
         }
 
-        speedFromMovement: 20
+        velocityFromMovement: 20
 
-        speed: PointDirection { xVariation: 5; yVariation: 5;}
+        velocity: PointDirection { xVariation: 5; yVariation: 5;}
         acceleration: PointDirection { xVariation: 5; yVariation: 5;}
 
         size: 16
diff --git a/examples/particles/imageparticle/deformation.qml b/examples/particles/imageparticle/deformation.qml
index e282927e78..0fca37e3e1 100644
--- a/examples/particles/imageparticle/deformation.qml
+++ b/examples/particles/imageparticle/deformation.qml
@@ -52,7 +52,7 @@ Rectangle {
         groups: ["goingLeft", "goingRight"]
         source: "../images/starfish_4.png"
         rotation: 90
-        rotationSpeed: 90
+        rotationVelocity: 90
         autoRotation: true
     }
     ImageParticle {
@@ -89,7 +89,7 @@ Rectangle {
         system: sys
         enabled: false
         group: "goingRight"
-        speed: PointDirection { x: 100 }
+        velocity: PointDirection { x: 100 }
         lifeSpan: 4000
         emitRate: 1
         size: 128
@@ -101,7 +101,7 @@ Rectangle {
         system: sys
         enabled: false
         group: "goingLeft"
-        speed: PointDirection { x: -100 }
+        velocity: PointDirection { x: -100 }
         lifeSpan: 4000
         emitRate: 1
         size: 128
@@ -113,7 +113,7 @@ Rectangle {
         system: sys
         enabled: false
         group: "goingDown"
-        speed: PointDirection { x: 100 }
+        velocity: PointDirection { x: 100 }
         lifeSpan: 4000
         emitRate: 1
         size: 128
diff --git a/examples/particles/imageparticle/rotation.qml b/examples/particles/imageparticle/rotation.qml
index 3a75c379ed..34e063b1f5 100644
--- a/examples/particles/imageparticle/rotation.qml
+++ b/examples/particles/imageparticle/rotation.qml
@@ -58,7 +58,7 @@ Rectangle {
         emitRate: 10
         size: 200
         lifeSpan: 10000
-        speed: AngleDirection {angleVariation: 360; magnitudeVariation: 100;}
+        velocity: AngleDirection {angleVariation: 360; magnitudeVariation: 100;}
     }
 
     MouseArea {
diff --git a/examples/particles/imageparticle/sharing.qml b/examples/particles/imageparticle/sharing.qml
index 27e08322d9..d1a516fc49 100644
--- a/examples/particles/imageparticle/sharing.qml
+++ b/examples/particles/imageparticle/sharing.qml
@@ -122,7 +122,7 @@ Rectangle {
             lifeSpan: 10000
             size: 24
             sizeVariation: 8
-            speed: AngleDirection { angleVariation: 360; magnitude: 3 }
+            velocity: AngleDirection { angleVariation: 360; magnitude: 3 }
             maximumEmitted: 10
             startTime: 5000
         }
diff --git a/examples/particles/imageparticle/sprites.qml b/examples/particles/imageparticle/sprites.qml
index 45ff2ebbaf..1e5aaa0f75 100644
--- a/examples/particles/imageparticle/sprites.qml
+++ b/examples/particles/imageparticle/sprites.qml
@@ -98,7 +98,7 @@ Rectangle {
         system: sys
         emitRate: 2
         lifeSpan: 10000
-        speed: AngleDirection {angle: 90; magnitude: 60; angleVariation: 5}
+        velocity: AngleDirection {angle: 90; magnitude: 60; angleVariation: 5}
         acceleration: PointDirection { y: 10 }
         size: 160
         sizeVariation: 40
diff --git a/examples/particles/itemparticle/delegates.qml b/examples/particles/itemparticle/delegates.qml
index 58734d320a..6df953925c 100644
--- a/examples/particles/itemparticle/delegates.qml
+++ b/examples/particles/itemparticle/delegates.qml
@@ -77,7 +77,7 @@ Rectangle {
             emitRate: 1
             lifeSpan: 4800
             lifeSpanVariation: 1600
-            speed: AngleDirection {angleVariation: 360; magnitude: 40; magnitudeVariation: 20}
+            velocity: AngleDirection {angleVariation: 360; magnitude: 40; magnitudeVariation: 20}
         }
         ItemParticle {
             delegate: Text {
diff --git a/examples/particles/itemparticle/particleview.qml b/examples/particles/itemparticle/particleview.qml
index 774539a958..1679c01337 100644
--- a/examples/particles/itemparticle/particleview.qml
+++ b/examples/particles/itemparticle/particleview.qml
@@ -72,7 +72,7 @@ Item {
         height: parent.height - 132/2
         x: -132/2
         y: 132/2
-        speed: PointDirection { x: 32; xVariation: 8 }
+        velocity: PointDirection { x: 32; xVariation: 8 }
         emitRate: 0.5
         lifeSpan: Emitter.InfiniteLife
         group: "photos"
@@ -160,7 +160,7 @@ Item {
     }
     Emitter {
         id: centerEmitter
-        speed: PointDirection { x: 32; xVariation: 8;}
+        velocity: PointDirection { x: 32; xVariation: 8;}
         emitRate: 0.5
         lifeSpan: 12000 //TODO: A -1 or something which does 'infinite'? (but need disable fade first)
         maximumEmitted: 20
@@ -185,7 +185,7 @@ Item {
         enabled: false
         size: 32
         endSize: 8
-        speed: AngleDirection { magnitude: 160; magnitudeVariation: 120; angleVariation: 90; angle: 270 }
+        velocity: AngleDirection { magnitude: 160; magnitudeVariation: 120; angleVariation: 90; angle: 270 }
         acceleration: PointDirection { y: 160 }
     }
     Item { x: -1000; y: -1000 //offscreen
diff --git a/examples/particles/simple/dynamiccomparison.qml b/examples/particles/simple/dynamiccomparison.qml
index a7cdb9b32a..d244e0e770 100644
--- a/examples/particles/simple/dynamiccomparison.qml
+++ b/examples/particles/simple/dynamiccomparison.qml
@@ -63,7 +63,7 @@ Rectangle {
         id: emitter
         system: sys
         width: parent.width/2
-        speed: PointDirection {y: 72; yVariation: 24}
+        velocity: PointDirection {y: 72; yVariation: 24}
         lifeSpan: 10000
         emitRate: 1000
         enabled: false
diff --git a/examples/particles/simple/dynamicemitters.qml b/examples/particles/simple/dynamicemitters.qml
index 4431ebe82e..8f007f3fdc 100644
--- a/examples/particles/simple/dynamicemitters.qml
+++ b/examples/particles/simple/dynamicemitters.qml
@@ -68,7 +68,7 @@ Rectangle {
                 lifeSpan: 600
                 size: 16
                 endSize: 8
-                speed: AngleDirection {angleVariation:360; magnitude: 60}
+                velocity: AngleDirection {angleVariation:360; magnitude: 60}
             }
 
             property int life: 2600
diff --git a/examples/particles/simple/multiplepainters.qml b/examples/particles/simple/multiplepainters.qml
index c1b85caa2d..62a254812d 100644
--- a/examples/particles/simple/multiplepainters.qml
+++ b/examples/particles/simple/multiplepainters.qml
@@ -61,7 +61,7 @@ Rectangle {
         emitRate: 200
         lifeSpan: 4000
         startTime: 4000
-        speed: PointDirection { y: -120; }
+        velocity: PointDirection { y: -120; }
     }
 
     ImageParticle {
diff --git a/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml b/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
index bed03e99aa..e6bd7bf174 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
+++ b/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
@@ -63,7 +63,7 @@ ParticleSystem {
         lifeSpan: 4000 + 800*(16-emitRate)
         maximumEmitted: 128
         size: 64
-        speed: PointDirection{ y: 40 + 10 * emitter.emitRate }
+        velocity: PointDirection{ y: 40 + 10 * emitter.emitRate }
     }
 
     Emitter {
@@ -74,7 +74,7 @@ ParticleSystem {
         emitRate: 1000
         size: 16
         endSize: 8
-        speed: CumulativeDirection { AngleDirection {angleVariation: 180; magnitudeVariation: 120;} PointDirection { y: -60 }}
+        velocity: CumulativeDirection { AngleDirection {angleVariation: 180; magnitudeVariation: 120;} PointDirection { y: -60 }}
         lifeSpan: 400
     }
     Emitter {
@@ -85,7 +85,7 @@ ParticleSystem {
         emitRate: 1000
         size: 16
         endSize: 8
-        speed: AngleDirection {angleVariation: 180; magnitudeVariation: 180;}
+        velocity: AngleDirection {angleVariation: 180; magnitudeVariation: 180;}
         lifeSpan: 600
     }
     Emitter {
@@ -96,7 +96,7 @@ ParticleSystem {
         emitRate: 1000
         size: 16
         endSize: 8
-        speed: CumulativeDirection { AngleDirection {angleVariation: 180; magnitudeVariation: 80;} PointDirection { y: 40 }}
+        velocity: CumulativeDirection { AngleDirection {angleVariation: 180; magnitudeVariation: 80;} PointDirection { y: 40 }}
         lifeSpan: 600
     }
 
diff --git a/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml b/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml
index 9788c5c665..7b32aa6630 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml
+++ b/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml
@@ -53,10 +53,10 @@ ParticleSystem {
     }
     Emitter {
         id: emitter
-        speedFromMovement: 20
+        velocityFromMovement: 20
         emitRate: 80
         lifeSpan: 1500
-        speed: PointDirection{ y: -90; yVariation: 50; }
+        velocity: PointDirection{ y: -90; yVariation: 50; }
         acceleration: PointDirection{ xVariation: 100; yVariation: 90; }
         size: 51
         sizeVariation: 53