1 files changed, 37 insertions, 37 deletions
diff --git a/examples/declarative/particles/trails/velocityfrommotion.qml b/examples/declarative/particles/trails/velocityfrommotion.qml
index 3692410853..d361c99f89 100644
--- a/examples/declarative/particles/trails/velocityfrommotion.qml
+++ b/examples/declarative/particles/trails/velocityfrommotion.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt.labs.particles 2.0
+import QtQuick.Particles 2.0
 
 Rectangle {
 
@@ -75,9 +75,9 @@ Rectangle {
     }
 
     ParticleSystem{ id: sys1 }
-    ColoredParticle{
+    ImageParticle{
         system: sys1
-        image: "content/particle.png"
+        source: "content/particle.png"
         color: "cyan"
         alpha: 0
         SequentialAnimation on color {
@@ -105,26 +105,26 @@ Rectangle {
         }
         colorVariation: 0.3
     }
-    TrailEmitter{
+    Emitter{
         id: trailsNormal
         system: sys1
 
-        particlesPerSecond: 500
-        particleDuration: 2000
+        emitRate: 500
+        lifeSpan: 2000
 
 
         y: mouseArea.pressed ? mouseArea.mouseY : circle.cy
         x: mouseArea.pressed ? mouseArea.mouseX : circle.cx
 
-        speed: PointVector{xVariation: 4; yVariation: 4;}
-        acceleration: PointVector{xVariation: 10; yVariation: 10;}
+        speed: PointDirection{xVariation: 4; yVariation: 4;}
+        acceleration: PointDirection{xVariation: 10; yVariation: 10;}
         speedFromMovement: 8
 
-        particleSize: 8
-        particleSizeVariation: 4
+        size: 8
+        sizeVariation: 4
     }
     ParticleSystem { id: sys2 }
-    ColoredParticle{
+    ImageParticle{
         color: "cyan"
         system: sys2
         alpha: 0
@@ -142,29 +142,29 @@ Rectangle {
             }
         }
         colorVariation: 0.5
-        image: "content/star.png"
+        source: "content/star.png"
     }
-    TrailEmitter{
+    Emitter{
         id: trailsStars
         system: sys2
 
-        particlesPerSecond: 100
-        particleDuration: 2200
+        emitRate: 100
+        lifeSpan: 2200
 
 
         y: mouseArea.pressed ? mouseArea.mouseY : circle.cy
         x: mouseArea.pressed ? mouseArea.mouseX : circle.cx
 
-        speed: PointVector{xVariation: 4; yVariation: 4;}
-        acceleration: PointVector{xVariation: 10; yVariation: 10;}
+        speed: PointDirection{xVariation: 4; yVariation: 4;}
+        acceleration: PointDirection{xVariation: 10; yVariation: 10;}
         speedFromMovement: 8
 
-        particleSize: 22
-        particleSizeVariation: 4
+        size: 22
+        sizeVariation: 4
     }
     ParticleSystem { id: sys3; }
-    ColoredParticle{
-        image: "content/particle.png"
+    ImageParticle{
+        source: "content/particle.png"
         system: sys3
         color: "orange"
         alpha: 0
@@ -185,28 +185,28 @@ Rectangle {
         colorVariation: 0.2
 
     }
-    TrailEmitter{
+    Emitter{
         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
 
         speedFromMovement: 16
 
-        speed: PointVector{xVariation: 4; yVariation: 4;}
-        acceleration: PointVector{xVariation: 10; yVariation: 10;}
+        speed: PointDirection{xVariation: 4; yVariation: 4;}
+        acceleration: PointDirection{xVariation: 10; yVariation: 10;}
 
-        particleSize: 12
-        particleSizeVariation: 4
+        size: 12
+        sizeVariation: 4
     }
     ParticleSystem { id: sys4; }
-    ColoredParticle{
+    ImageParticle{
         system: sys4
-        image: "content/star.png"
+        source: "content/star.png"
         color: "green"
         alpha: 0
         SequentialAnimation on color {
@@ -225,23 +225,23 @@ Rectangle {
 
         colorVariation: 0.5
     }
-    TrailEmitter{
+    Emitter{
         id: trailsStars2
         system: sys4
 
-        particlesPerSecond: 50
-        particleDuration: 2200
+        emitRate: 50
+        lifeSpan: 2200
 
 
         y: mouseArea.pressed ? mouseArea.mouseY : circle2.cy
         x: mouseArea.pressed ? mouseArea.mouseX : circle2.cx
 
         speedFromMovement: 16
-        speed: PointVector{xVariation: 2; yVariation: 2;}
-        acceleration: PointVector{xVariation: 10; yVariation: 10;}
+        speed: PointDirection{xVariation: 2; yVariation: 2;}
+        acceleration: PointDirection{xVariation: 10; yVariation: 10;}
 
-        particleSize: 22
-        particleSizeVariation: 4
+        size: 22
+        sizeVariation: 4
     }