Particles examples shuffle

Recast as examples, not demos. Fewer licking face usages.

Change-Id: I02a03fb9af513cbc3dc2a94aa0843220f162593b
Reviewed-on: http://codereview.qt-project.org/4754
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

151 files changed, 1124 insertions, 903 deletions

diff --git a/examples/declarative/particles/asteroid/blackhole.qml b/examples/declarative/particles/affectors/attractor.qml
index 00fca7ef3c..8012e710df 100644
--- a/examples/declarative/particles/asteroid/blackhole.qml
+++ b/examples/declarative/particles/affectors/attractor.qml
@@ -49,7 +49,7 @@ Rectangle{
     property bool spacePressed: false
     focus: true
     Image{
-        source: "content/finalfrontier.png"
+        source: "../images/finalfrontier.png"
         anchors.centerIn:parent
     }
     Keys.onPressed: {
@@ -95,7 +95,7 @@ Rectangle{
         id: stars
         groups: ["stars"]
         system: particles
-        source: "content/star.png"
+        source: "../images/star.png"
         color: "white"
         colorVariation: 0.1
         alpha: 0
@@ -107,7 +107,7 @@ Rectangle{
         sprites: Sprite{
             id: spinState
             name: "spinning"
-            source: "content/meteor.png"
+            source: "../images/meteor.png"
             frames: 35
             duration: 60
             speedModifiesDuration: -0.1
@@ -117,7 +117,7 @@ Rectangle{
         id: shot
         groups: ["shot"]
         system: particles
-        source: "content/star.png"
+        source: "../images/star.png"
 
         color: "#0FF06600"
         colorVariation: 0.3
@@ -126,7 +126,7 @@ Rectangle{
         id: engine
         groups: ["engine"]
         system: particles
-        source: "content/particle4.png"
+        source: "../images/particle4.png"
 
         color: "orange"
         SequentialAnimation on color {
@@ -158,8 +158,16 @@ Rectangle{
         width: 16
         height: 16
     }
+    Rectangle{
+        color: "black"
+        width: 8
+        height: 8
+        radius: 4
+        x: gs.pointX - 4
+        y: gs.pointY - 4
+    }
     Image{
-        source:"content/rocket2.png"
+        source:"../images/rocket2.png"
         id: ship
         width: 45
         height: 22
diff --git a/examples/declarative/particles/custom/fallingleaves.qml b/examples/declarative/particles/affectors/customaffector.qml
index 91c64961cb..35708b7864 100644
--- a/examples/declarative/particles/custom/fallingleaves.qml
+++ b/examples/declarative/particles/affectors/customaffector.qml
@@ -46,7 +46,7 @@ Item {
     height: 600
 
     Image{
-        source: "content/backgroundLeaves.jpg"
+        source: "../images/backgroundLeaves.jpg"
         anchors.fill: parent
     }
     ParticleSystem{ id: sys }
@@ -124,31 +124,31 @@ Item {
         id: particles
         system: sys
         sprites: [Sprite{
-                source: "content/realLeaf1.png"
+                source: "../images/realLeaf1.png"
                 frames: 1
                 duration: 1
                 to: {"a":1, "b":1, "c":1, "d":1}
             }, Sprite{
                 name: "a"
-                source: "content/realLeaf1.png"
+                source: "../images/realLeaf1.png"
                 frames: 1
                 duration: 10000
             },
             Sprite{
                 name: "b"
-                source: "content/realLeaf2.png"
+                source: "../images/realLeaf2.png"
                 frames: 1
                 duration: 10000
             },
             Sprite{
                 name: "c"
-                source: "content/realLeaf3.png"
+                source: "../images/realLeaf3.png"
                 frames: 1
                 duration: 10000
             },
             Sprite{
                 name: "d"
-                source: "content/realLeaf4.png"
+                source: "../images/realLeaf4.png"
                 frames: 1
                 duration: 10000
             }
diff --git a/examples/declarative/particles/trails/combustion.qml b/examples/declarative/particles/affectors/groupgoal.qml
index 238dbe8a79..ad45b87d1c 100644
--- a/examples/declarative/particles/trails/combustion.qml
+++ b/examples/declarative/particles/affectors/groupgoal.qml
@@ -62,7 +62,7 @@ Rectangle {
             duration: 1000
             to: {"lighting":1, "unlit":99}
             ImageParticle{
-                source: "content/particleA.png"
+                source: "../images/particleA.png"
                 colorVariation: 0.1
                 color: "#2060160f"
             }
@@ -118,7 +118,7 @@ Rectangle {
             id: smoke
             anchors.fill: parent
             groups: ["smoke"]
-            source: "content/particle.png"
+            source: "../images/particle.png"
             colorVariation: 0
             color: "#00111111"
         }
@@ -126,7 +126,7 @@ Rectangle {
             id: pilot
             anchors.fill: parent
             groups: ["pilot"]
-            source: "content/particle.png"
+            source: "../images/particle.png"
             redVariation: 0.01
             blueVariation: 0.4
             color: "#0010004f"
@@ -135,7 +135,7 @@ Rectangle {
             id: flame
             anchors.fill: parent
             groups: ["flame", "lit", "lighting"]
-            source: "content/particleA.png"
+            source: "../images/particleA.png"
             colorVariation: 0.1
             color: "#00ff400f"
         }
@@ -172,7 +172,7 @@ Rectangle {
                 y: -55
                 height: 75
                 width: 30
-                shape: MaskShape{source: "content/matchmask.png"}
+                shape: MaskShape{source: "../images/matchmask.png"}
             }
         }
         //Click to enflame
diff --git a/examples/declarative/particles/asteroid/asteroid.qml b/examples/declarative/particles/affectors/spritegoal.qml
index 6d556997c7..a7b602954c 100644
--- a/examples/declarative/particles/asteroid/asteroid.qml
+++ b/examples/declarative/particles/affectors/spritegoal.qml
@@ -53,7 +53,7 @@ Item {
 
     ParticleSystem { id: sys }
     Image {
-        source: "content/finalfrontier.png"
+        source: "../images/finalfrontier.png"
         transformOrigin: Item.Center
         anchors.centerIn: parent
         smooth: true
@@ -68,7 +68,7 @@ Item {
     ImageParticle {
         system: sys
         groups: ["starfield"]
-        source: "content/star.png"
+        source: "../images/star.png"
         colorVariation: 0.3
         color: "white"
     }
@@ -105,21 +105,21 @@ Item {
         sprites:[Sprite{
                 id: spinState
                 name: "spinning"
-                source: "content/meteor.png"
+                source: "../images/meteor.png"
                 frames: 35
                 duration: 40
                 speedModifiesDuration: -0.1
                 to: {"explode":0, "spinning":1}
             },Sprite{
                 name: "explode"
-                source: "content/_explo.png"
+                source: "../images/_explo.png"
                 frames: 22
                 duration: 40
                 speedModifiesDuration: -0.1
                 to: {"nullFrame":1}
             },Sprite{//Not sure if this is needed, but seemed easiest
                 name: "nullFrame"
-                source: "content/nullRock.png"
+                source: "../images/nullRock.png"
                 frames: 1
                 duration: 1000
             }
@@ -136,7 +136,7 @@ Item {
     }
     Image {
         id: rocketShip
-        source: "content/rocket.png"
+        source: "../images/rocket.png"
         smooth: true
         anchors.centerIn: holder
         rotation: (circle.percent+0.25) * 360
@@ -171,7 +171,7 @@ Item {
         z:0 
         system: sys
         groups: ["exhaust"]
-        source: "content/particle4.png"
+        source: "../images/particle4.png"
 
         color: "orange"
         SequentialAnimation on color {
diff --git a/examples/declarative/particles/trails/turbulence.qml b/examples/declarative/particles/affectors/turbulence.qml
index 13eae162f4..75737240bc 100644
--- a/examples/declarative/particles/trails/turbulence.qml
+++ b/examples/declarative/particles/affectors/turbulence.qml
@@ -47,7 +47,7 @@ Rectangle{
     color: "#222222"
     id: root
     Image{
-        source: "content/candle.png"
+        source: "../images/candle.png"
         anchors.bottom: parent.bottom
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottomMargin: -8
@@ -73,14 +73,14 @@ Rectangle{
     ImageParticle{
         groups: ["smoke"]
         system: ps
-        source: "content/particle.png"
+        source: "../images/particle.png"
         color: "#11111111"
         colorVariation: 0
     }
     ImageParticle{
         groups: ["flame"]
         system: ps
-        source: "content/particle.png"
+        source: "../images/particle.png"
         color: "#11ff400f"
         colorVariation: 0.1
     }
diff --git a/examples/declarative/particles/snow/snow.qml b/examples/declarative/particles/affectors/wander.qml
index 39e322fe84..8d9e55e710 100644
--- a/examples/declarative/particles/snow/snow.qml
+++ b/examples/declarative/particles/affectors/wander.qml
@@ -40,8 +40,7 @@
 
 import QtQuick 2.0
 import QtQuick.Particles 2.0
-import "content"
-import "../launcherContent" as UI
+import "../exampleslauncher/content" as UI
 
 Rectangle{
     width: 360
@@ -51,7 +50,7 @@ Rectangle{
         system: particles
         sprites: Sprite{
             name: "snow"
-            source: "content/flake-01.png"
+            source: "../images/snowflake.png"
             frames: 51
             duration: 40
             durationVariation: 8
diff --git a/examples/declarative/particles/allsmiles/smile.qml b/examples/declarative/particles/allsmiles/smile.qml
deleted file mode 100644
index e091d99e80..0000000000
--- a/examples/declarative/particles/allsmiles/smile.qml
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Rectangle{
-    id: root
-    color: "white"
-    width: 310
-    height: 300
-    ParticleSystem{ id: sys }
-    CustomParticle{
-        system: sys
-        property real maxWidth: root.width
-        property real maxHeight: root.height
-        ShaderEffectSource{
-            id: pictureSource
-            sourceItem: picture
-            hideSource: true
-        }
-        Image{
-            id: picture
-            source: "content/singlesmile.png"
-        }
-        ShaderEffectSource{
-            id: particleSource
-            sourceItem: particle
-            hideSource: true
-        }
-        Image{
-            id: particle
-            source: "content/particle.png"
-        }
-        vertexShader:"
-            uniform highp float maxWidth;
-            uniform highp float maxHeight;
-            varying highp vec2 fTex2;
-            varying lowp float fFade;
-            uniform lowp float qt_Opacity;
-
-            void main() {                                           
-                fTex2 = vec2(qt_ParticlePos.x / maxWidth, qt_ParticlePos.y / maxHeight);
-                highp float t = (qt_Timestamp - qt_ParticleData.x) / qt_ParticleData.y;
-                fFade = min(t*4., (1.-t*t)*.75) * qt_Opacity;
-                defaultMain();
-            }
-        "
-        property variant particleTexture: particleSource
-        property variant pictureTexture: pictureSource
-        fragmentShader: "
-            uniform sampler2D particleTexture;
-            uniform sampler2D pictureTexture;
-            varying highp vec2 qt_TexCoord0;
-            varying highp vec2 fTex2;
-            varying lowp float fFade;
-            void main() {
-                gl_FragColor = texture2D(pictureTexture, fTex2) * texture2D(particleTexture, qt_TexCoord0).w * fFade;
-        }"
-    }
-    Emitter{
-        id: emitter
-        system: sys
-        enabled: false
-        lifeSpan: 4000
-        maximumEmitted: 1200
-        anchors.fill: parent
-        size: 32
-        speed: PointDirection{ xVariation: 12; yVariation: 12 }
-    }
-    MouseArea{
-        anchors.fill: parent
-        onClicked: emitter.burst(1200);
-    }
-}
-
diff --git a/examples/declarative/particles/allsmiles/spriteparticles.qml b/examples/declarative/particles/allsmiles/spriteparticles.qml
deleted file mode 100644
index 0586dfd8db..0000000000
--- a/examples/declarative/particles/allsmiles/spriteparticles.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Rectangle{
-    color: "goldenrod"
-    width: 400
-    height: 400
-    ImageParticle{
-        id: test
-        groups: ["Test"]
-        source: "content/particle.png"
-        system: sys
-        z: 2
-        anchors.fill: parent
-        color: "#336666CC"
-        colorVariation: 0.0
-    }
-    ImageParticle{
-        id: single
-        groups: ["Face"]
-        system: sys
-        z: 2
-        anchors.fill: parent
-        sprites: Sprite{
-            source: "content/squarefacesprite.png"
-            frames: 6
-            duration: 120
-        }
-    }
-    MaskShape{
-        id: mask
-        source: "content/smileMask.png"
-    }
-    Emitter{
-        system: sys
-        group: "Test"
-        anchors.fill: parent
-        id: particles2
-        emitRate: 6000
-        lifeSpan: 720
-        size: 10
-        shape: mask
-    }
-    Emitter{
-        system: sys
-        group: "Face"
-        anchors.fill: parent
-        id: particles
-        emitRate: 60
-        lifeSpan: 1440
-        speed: PointDirection{xVariation: 10; yVariation: 10;}
-        size: 30
-        sizeVariation: 10
-        shape: mask
-    }
-    ParticleSystem{
-        id: sys
-        anchors.fill: parent
-    }
-
-}
diff --git a/examples/declarative/particles/allsmiles/spritevariedparticles.qml b/examples/declarative/particles/allsmiles/spritevariedparticles.qml
deleted file mode 100644
index 4696bfb4ff..0000000000
--- a/examples/declarative/particles/allsmiles/spritevariedparticles.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Rectangle{
-    color: "goldenrod"
-    width: 800
-    height: 800
-    ParticleSystem{ id: sys }
-    ImageParticle{
-        system: sys
-        anchors.fill: parent
-        sprites: [Sprite{
-            name: "initial"
-            source: "content/squarefacesprite.png"
-            frames: 6
-            duration: 0
-            to: {"happy":0.2, "silly":0.2, "sad":0.2, "cyclops":0.1, "evil":0.1, "love":0.1, "boggled":0.1}
-        }, Sprite{
-            name: "silly"
-            source: "content/squarefacesprite.png"
-            frames: 6
-            duration: 120
-        }, Sprite{
-            name: "happy"
-            source: "content/squarefacesprite2.png"
-            frames: 6
-            duration: 120
-        }, Sprite{
-            name: "sad"
-            source: "content/squarefacesprite3.png"
-            frames: 6
-            duration: 120
-        }, Sprite{
-            name: "cyclops"
-            source: "content/squarefacesprite4.png"
-            frames: 6
-            duration: 120
-        }, Sprite{
-            name: "evil"
-            source: "content/squarefacesprite5.png"
-            frames: 6
-            duration: 120
-        }, Sprite{
-            name: "love"
-            source: "content/squarefacesprite6.png"
-            frames: 6
-            duration: 120
-        }, Sprite{
-            name: "boggled"
-            source: "content/squarefacesprite7.png"
-            frames: 6
-            duration: 120
-        }]
-    }
-    Emitter{
-        id: particleEmitter
-        system: sys
-        width: parent.width
-        emitRate: 16
-        lifeSpan: 8000
-        speed: AngleDirection{angle: 90; magnitude: 300; magnitudeVariation: 100; angleVariation: 5}
-        acceleration: PointDirection{ y: 10 }
-        size: 30
-        sizeVariation: 10
-    }
-    Binding{
-        target: particleEmitter
-        property: "y"
-        value: ma.mouseY
-        when: ma.mouseX !=0 || ma.mouseY!=0
-    }
-    MouseArea{
-        id: ma
-        anchors.fill: parent
-    }
-}
diff --git a/examples/declarative/particles/custom/custom.qml b/examples/declarative/particles/custom/custom.qml
deleted file mode 100644
index 84d747964c..0000000000
--- a/examples/declarative/particles/custom/custom.qml
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-ParticleSystem{
-    id: sys
-    width: 360
-    height: 600
-    running: true
-    Rectangle{
-        z: -1
-        anchors.fill: parent
-        color: "black"
-        Text{
-            anchors.bottom: parent.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-            font.pixelSize: 42
-            color: "white"
-            text: "It's all in QML."
-        }
-    }
-    property real petalLength: 180
-    property real petalRotation: 0
-    NumberAnimation on petalRotation{
-        from: 0;
-        to: 360;
-        loops: -1;
-        running: true
-        duration: 24000
-    }
-    function convert(a){return a*(Math.PI/180);}
-    Emitter{
-        lifeSpan: 4000
-        emitRate: 120
-        size: 12
-        anchors.centerIn: parent
-        onEmitParticle:{
-            particle.startSize = Math.max(12,Math.min(492,Math.tan(particle.t/2)*24));
-            var theta = Math.floor(Math.random() * 6.0) / 6.0;
-            theta *= 2.0*Math.PI;
-            theta += sys.convert(sys.petalRotation);
-            particle.initialVX = petalLength * Math.cos(theta);
-            particle.initialVY = petalLength * Math.sin(theta);
-            particle.initialAX = particle.initialVX * -0.5;
-            particle.initialAY = particle.initialVY * -0.5;
-        }
-    }
-    CustomParticle{
-        vertexShader:"
-            uniform lowp float qt_Opacity;
-            varying lowp float fFade;
-            varying highp vec2 fPos;
-
-            void main() {                                           
-                qt_TexCoord0 = qt_ParticleTex;
-                highp float size = qt_ParticleData.z;
-                highp float endSize = qt_ParticleData.w;
-
-                highp float t = (qt_Timestamp - qt_ParticleData.x) / qt_ParticleData.y;
-
-                highp float currentSize = mix(size, endSize, t * t);
-
-                if (t < 0. || t > 1.)
-                currentSize = 0.;
-
-                highp vec2 pos = qt_ParticlePos
-                - currentSize / 2. + currentSize * qt_ParticleTex          // adjust size
-                + qt_ParticleVec.xy * t * qt_ParticleData.y         // apply speed vector..
-                + 0.5 * qt_ParticleVec.zw * pow(t * qt_ParticleData.y, 2.);
-
-                gl_Position = qt_Matrix * vec4(pos.x, pos.y, 0, 1);
-
-                highp float fadeIn = min(t * 20., 1.);
-                highp float fadeOut = 1. - max(0., min((t - 0.75) * 4., 1.));
-
-                fFade = fadeIn * fadeOut * qt_Opacity;
-                fPos = vec2(pos.x/360.0, pos.y/600.0);
-            }
-        "
-        fragmentShader: "
-            varying highp vec2 fPos;
-            varying lowp float fFade;
-            varying highp vec2 qt_TexCoord0;
-            void main() {//*2 because this generates dark colors mostly
-                highp vec2 circlePos = qt_TexCoord0*2.0 - vec2(1.0,1.0);
-                highp float dist = length(circlePos);
-                highp float circleFactor = max(min(1.0 - dist, 1.0), 0.0);
-                gl_FragColor = vec4(fPos.x*2.0 - fPos.y, fPos.y*2.0 - fPos.x, fPos.x*fPos.y*2.0, 0.0) * circleFactor * fFade;
-            }"
-
-    }
-}
diff --git a/examples/declarative/particles/custom/blurparticles.qml b/examples/declarative/particles/customparticle/blurparticles.qml
index b054cfbbb9..4c33d14969 100644
--- a/examples/declarative/particles/custom/blurparticles.qml
+++ b/examples/declarative/particles/customparticle/blurparticles.qml
@@ -63,7 +63,7 @@ Rectangle{
     }
     Image{
         id: theItem
-        source: "content/smile.png"
+        source: "../images/smile.png"
     }
 
     CustomParticle{
diff --git a/examples/declarative/particles/custom/shader.qml b/examples/declarative/particles/customparticle/fragmentshader.qml
index ecc06a6be6..ecc06a6be6 100644
--- a/examples/declarative/particles/custom/shader.qml
+++ b/examples/declarative/particles/customparticle/fragmentshader.qml
diff --git a/examples/declarative/particles/customparticle/imagecolors.qml b/examples/declarative/particles/customparticle/imagecolors.qml
new file mode 100644
index 0000000000..20d6220ee3
--- /dev/null
+++ b/examples/declarative/particles/customparticle/imagecolors.qml
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+
+Rectangle{
+    width: 400
+    height: 400
+    Rectangle{
+        id: root
+        color: "white"
+        width: 310
+        height: 300
+        anchors.centerIn: parent
+        ParticleSystem{ id: sys }
+        CustomParticle{
+            system: sys
+            property real maxWidth: root.width
+            property real maxHeight: root.height
+            ShaderEffectSource{
+                id: pictureSource
+                sourceItem: picture
+                hideSource: true
+            }
+            Image{
+                id: picture
+                source: "../images/smile.png"
+            }
+            ShaderEffectSource{
+                id: particleSource
+                sourceItem: particle
+                hideSource: true
+            }
+            Image{
+                id: particle
+                source: "../images/particle.png"
+            }
+            vertexShader:"
+                uniform highp float maxWidth;
+                uniform highp float maxHeight;
+                varying highp vec2 fTex2;
+                varying lowp float fFade;
+                uniform lowp float qt_Opacity;
+
+                void main() {                                           
+                    fTex2 = vec2(qt_ParticlePos.x / maxWidth, qt_ParticlePos.y / maxHeight);
+                    highp float t = (qt_Timestamp - qt_ParticleData.x) / qt_ParticleData.y;
+                    fFade = min(t*4., (1.-t*t)*.75) * qt_Opacity;
+                    defaultMain();
+                }
+            "
+            property variant particleTexture: particleSource
+            property variant pictureTexture: pictureSource
+            fragmentShader: "
+                uniform sampler2D particleTexture;
+                uniform sampler2D pictureTexture;
+                varying highp vec2 qt_TexCoord0;
+                varying highp vec2 fTex2;
+                varying lowp float fFade;
+                void main() {
+                    gl_FragColor = texture2D(pictureTexture, fTex2) * texture2D(particleTexture, qt_TexCoord0).w * fFade;
+            }"
+        }
+        Emitter{
+            id: emitter
+            system: sys
+            enabled: false
+            lifeSpan: 4000
+            maximumEmitted: 1200
+            anchors.fill: parent
+            size: 32
+            speed: PointDirection{ xVariation: 12; yVariation: 12 }
+        }
+        MouseArea{
+            anchors.fill: parent
+            onClicked: emitter.burst(1200);
+        }
+    }
+}
diff --git a/examples/declarative/particles/emitters/customemitter.qml b/examples/declarative/particles/emitters/customemitter.qml
new file mode 100644
index 0000000000..55c3884a11
--- /dev/null
+++ b/examples/declarative/particles/emitters/customemitter.qml
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+
+ParticleSystem{
+    id: sys
+    width: 360
+    height: 600
+    running: true
+    Rectangle{
+        z: -1
+        anchors.fill: parent
+        color: "black"
+    }
+    property real petalLength: 180
+    property real petalRotation: 0
+    NumberAnimation on petalRotation{
+        from: 0;
+        to: 360;
+        loops: -1;
+        running: true
+        duration: 24000
+    }
+    function convert(a){return a*(Math.PI/180);}
+    Emitter{
+        lifeSpan: 4000
+        emitRate: 120
+        size: 12
+        anchors.centerIn: parent
+        onEmitParticle:{
+            particle.startSize = Math.max(02,Math.min(492,Math.tan(particle.t/2)*24));
+            var theta = Math.floor(Math.random() * 6.0) / 6.0;
+            theta *= 2.0*Math.PI;
+            theta += sys.convert(sys.petalRotation);
+            particle.initialVX = petalLength * Math.cos(theta);
+            particle.initialVY = petalLength * Math.sin(theta);
+            particle.initialAX = particle.initialVX * -0.5;
+            particle.initialAY = particle.initialVY * -0.5;
+        }
+    }
+    ImageParticle{
+        source: "../images/particle4.png"
+        alpha: 0.0
+        redVariation: 0.6
+        color: "white"
+    }
+}
diff --git a/examples/declarative/particles/emitters/emitmask.qml b/examples/declarative/particles/emitters/emitmask.qml
new file mode 100644
index 0000000000..fddf567d97
--- /dev/null
+++ b/examples/declarative/particles/emitters/emitmask.qml
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+
+Rectangle{
+    color: "goldenrod"
+    width: 400
+    height: 400
+    ParticleSystem{
+        width: 300
+        height: 300
+        anchors.centerIn: parent
+        ImageParticle{
+            source: "../images/particle.png"
+            z: 2
+            anchors.fill: parent
+            color: "#336666CC"
+            colorVariation: 0.0
+        }
+        Emitter{
+            anchors.fill: parent
+            emitRate: 6000
+            lifeSpan: 720
+            size: 10
+            shape: MaskShape{
+                source: "../images/smileMask.png"
+            }
+        }
+    }
+}
diff --git a/examples/declarative/particles/trails/overburst.qml b/examples/declarative/particles/emitters/maximumemitted.qml
index baf1bf3046..6342eb338e 100644
--- a/examples/declarative/particles/trails/overburst.qml
+++ b/examples/declarative/particles/emitters/maximumemitted.qml
@@ -52,7 +52,7 @@ Rectangle{
     ImageParticle{
         system: sys
         id: cp
-        source: "content/particle.png"
+        source: "../images/particle.png"
         colorVariation: 0.4
         color: "#000000FF"
     }
@@ -75,14 +75,4 @@ Rectangle{
         onPressed: sys.resume()
         id: ma
     }
-    MouseArea{
-        width: 100
-        height: 100
-        onClicked: bursty.maximumEmitted = -1;
-        id: ma2
-        Rectangle{
-            anchors.fill: parent
-            color: "lightsteelblue"
-        }
-    }
 }
diff --git a/examples/declarative/particles/trails/portal.qml b/examples/declarative/particles/emitters/shapeanddirection.qml
index adf620fd9b..9e7a990ef8 100644
--- a/examples/declarative/particles/trails/portal.qml
+++ b/examples/declarative/particles/emitters/shapeanddirection.qml
@@ -48,7 +48,7 @@ Rectangle{
     color: "black"
     Image{
         anchors.fill: parent
-        source: "content/portal_bg.png"
+        source: "../images/portal_bg.png"
     }
     ParticleSystem{ 
         id: particles 
@@ -57,7 +57,7 @@ Rectangle{
         groups: ["center","edge"]
         anchors.fill: parent
         system: particles
-        source: "content/particle.png"
+        source: "../images/particle.png"
         colorVariation: 0.1
         color: "#009999FF"
     }
@@ -65,7 +65,7 @@ Rectangle{
         anchors.fill: parent
         group: "center"
         system: particles
-        emitRate: 200
+        emitRate: 400
         lifeSpan: 2000
         size: 20
         sizeVariation: 2
@@ -83,11 +83,11 @@ Rectangle{
         group: "edge"
         startTime: 2000
         system: particles
-        emitRate: 4000
+        emitRate: 2000
         lifeSpan: 2000
-        size: 20
+        size: 28
         sizeVariation: 2
-        endSize: 0
+        endSize: 16
         shape: EllipseShape{fill: false}
         speed: TargetDirection{
             targetX: root.width/2 
diff --git a/examples/declarative/particles/trails/fireworks.qml b/examples/declarative/particles/emitters/timedgroupchanges.qml
index 6b370b3991..e76a4439b1 100644
--- a/examples/declarative/particles/trails/fireworks.qml
+++ b/examples/declarative/particles/emitters/timedgroupchanges.qml
@@ -110,7 +110,7 @@ Rectangle{
         }
         ImageParticle{
             groups: ["works", "fire", "splode"]
-            source: "content/particle.png"
+            source: "../images/particle.png"
             entryEffect: ImageParticle.Scale
         }
     }
diff --git a/examples/declarative/particles/trails/fireballs.qml b/examples/declarative/particles/emitters/trailemitter.qml
index c7c0420049..d5986cc9b8 100644
--- a/examples/declarative/particles/trails/fireballs.qml
+++ b/examples/declarative/particles/emitters/trailemitter.qml
@@ -51,23 +51,12 @@ Rectangle {
         id: particles
     }
 
-    /*
-    ImageParticle{
-        id: fireball
-        anchors.fill: parent
-        groups: ["E"]
-        system: particles
-        source: "content/particleA.png"
-        colorVariation: 0.2
-        color: "#00ff400f"
-    }
-    */
     ImageParticle{
         id: smoke
         system: particles
         anchors.fill: parent
         groups: ["A", "B"]
-        source: "content/particle.png"
+        source: "../images/particle.png"
         colorVariation: 0
         color: "#00111111"
     }
@@ -76,7 +65,7 @@ Rectangle {
         anchors.fill: parent
         system: particles
         groups: ["C", "D"]
-        source: "content/particle.png"
+        source: "../images/particle.png"
         colorVariation: 0.1
         color: "#00ff400f"
     }
@@ -169,6 +158,11 @@ Rectangle {
         size: 12
         sizeVariation: 4
     }
-
+    Turbulence { //A bit of turbulence makes the smoke look better
+        anchors.fill: parent
+        groups: ["A","B"]
+        strength: 32
+        system: particles
+    }
 }
 
diff --git a/examples/declarative/particles/trails/velocityfrommotion.qml b/examples/declarative/particles/emitters/velocityfrommotion.qml
index d361c99f89..e42a72c94e 100644
--- a/examples/declarative/particles/trails/velocityfrommotion.qml
+++ b/examples/declarative/particles/emitters/velocityfrommotion.qml
@@ -77,7 +77,7 @@ Rectangle {
     ParticleSystem{ id: sys1 }
     ImageParticle{
         system: sys1
-        source: "content/particle.png"
+        source: "../images/particle.png"
         color: "cyan"
         alpha: 0
         SequentialAnimation on color {
@@ -142,7 +142,7 @@ Rectangle {
             }
         }
         colorVariation: 0.5
-        source: "content/star.png"
+        source: "../images/star.png"
     }
     Emitter{
         id: trailsStars
@@ -164,7 +164,7 @@ Rectangle {
     }
     ParticleSystem { id: sys3; }
     ImageParticle{
-        source: "content/particle.png"
+        source: "../images/particle.png"
         system: sys3
         color: "orange"
         alpha: 0
@@ -206,7 +206,7 @@ Rectangle {
     ParticleSystem { id: sys4; }
     ImageParticle{
         system: sys4
-        source: "content/star.png"
+        source: "../images/star.png"
         color: "green"
         alpha: 0
         SequentialAnimation on color {
diff --git a/examples/declarative/particles/launcherContent/Button.qml b/examples/declarative/particles/exampleslauncher/content/Button.qml
index a937b3bede..a937b3bede 100644
--- a/examples/declarative/particles/launcherContent/Button.qml
+++ b/examples/declarative/particles/exampleslauncher/content/Button.qml
diff --git a/examples/declarative/particles/launcherContent/Shell.qml b/examples/declarative/particles/exampleslauncher/content/Shell.qml
index 32b0cd624c..3a327915ed 100644
--- a/examples/declarative/particles/launcherContent/Shell.qml
+++ b/examples/declarative/particles/exampleslauncher/content/Shell.qml
@@ -54,7 +54,7 @@ Loader{
     }
     Image{//TODO: Augment with PARTICLES
         z: 1
-        source: "icons/close.png"
+        source: "../../images/launcherIcons/close.png"
         MouseArea{
             anchors.fill: parent
             onClicked: ldr.visible = false;
diff --git a/examples/declarative/particles/launcherContent/launcher.js b/examples/declarative/particles/exampleslauncher/content/launcher.js
index e4fedd30d7..a296dbd6a6 100644
--- a/examples/declarative/particles/launcherContent/launcher.js
+++ b/examples/declarative/particles/exampleslauncher/content/launcher.js
@@ -4,5 +4,5 @@ function nameFromPath(path){
 }
 function iconFromPath(path){
     var ret = path.split('/');
-    return "launcherContent/icons/" + ret[ret.length-1].split('.')[0] + ".png";
+    return "../images/launcherIcons/" + ret[ret.length-1].split('.')[0] + ".png";
 }
diff --git a/examples/declarative/particles/exampleslauncher.qml b/examples/declarative/particles/exampleslauncher/exampleslauncher.qml
index 91641e595b..92dd797ea1 100644
--- a/examples/declarative/particles/exampleslauncher.qml
+++ b/examples/declarative/particles/exampleslauncher/exampleslauncher.qml
@@ -40,8 +40,8 @@
 
 import QtQuick 2.0
 import QtQuick.Particles 2.0
-import "launcherContent/launcher.js" as Util
-import "launcherContent"
+import "content/launcher.js" as Util
+import "content"
 
 Rectangle{
     color: "black"
@@ -52,36 +52,36 @@ Rectangle{
         id: shell
         anchors.fill: parent
     }
-    VisualDataModel{//TODO: Transitions between modes
+    VisualDataModel{//TODO: Transitions between modes (and a second mode...)
         id: vdm
         model: [
-            "../snow/snow.qml",
-            "../asteroid/asteroid.qml",
-            "../asteroid/blackhole.qml",
-            "../custom/blurparticles.qml",
-            "../custom/custom.qml",
-            "../custom/fallingleaves.qml",
-            "../allsmiles/plain.qml",
-            "../allsmiles/smile.qml",
-            "../allsmiles/smilefactory.qml",
-            "../allsmiles/ultraparticles.qml",
-            "../allsmiles/spriteparticles.qml",
-            "../allsmiles/spritestateparticles.qml",
-            "../allsmiles/spritevariedparticles.qml",
-            "../trails/velocityfrommotion.qml",
-            "../trails/fireballs.qml",
-            "../trails/combustion.qml",
-            "../trails/list.qml",
-            "../trails/portal.qml",
-            "../trails/rainbow.qml",
-            "../trails/dynamicemitters.qml",
-            "../trails/overburst.qml",
-            "../trails/layered.qml",
-            "../trails/shimmer.qml",
-            "../trails/turbulence.qml",
-            "../../samegame/samegame.qml",
-            "../../plasmapatrol/plasmapatrol.qml",
-            "../../flickr/flickr.qml"
+            "../../affectors/attractor.qml",
+            "../../affectors/customaffector.qml",
+            "../../affectors/groupgoal.qml",
+            "../../affectors/spritegoal.qml",
+            "../../affectors/turbulence.qml",
+            "../../affectors/wander.qml",
+            "../../customparticle/blurparticles.qml",
+            "../../customparticle/fragmentshader.qml",
+            "../../customparticle/imagecolors.qml",
+            "../../emitters/customemitter.qml",
+            "../../emitters/emitmask.qml",
+            "../../emitters/maximumemitted.qml",
+            "../../emitters/shapeanddirection.qml",
+            "../../emitters/timedgroupchanges.qml",
+            "../../emitters/trailemitter.qml",
+            "../../emitters/velocityfrommotion.qml",
+            "../../imageparticle/allatonce.qml",
+            "../../imageparticle/colortable.qml",
+            "../../imageparticle/deformation.qml",
+            "../../imageparticle/rotation.qml",
+            "../../imageparticle/sprites.qml",
+            "../../itemparticle/delegates.qml",
+            "../../itemparticle/particleview.qml",
+            "../../simple/dynamicemitters.qml",
+            "../../simple/multiplepainters.qml",
+            "../../simple/startstop.qml",
+            "../../plasmapatrol/plasmapatrol.qml"
         ]
         delegate: Rectangle{
             color: "white"
diff --git a/examples/declarative/particles/allsmiles/ultraparticles.qml b/examples/declarative/particles/imageparticle/allatonce.qml
index 9094e83801..b37bf00d69 100644
--- a/examples/declarative/particles/allsmiles/ultraparticles.qml
+++ b/examples/declarative/particles/imageparticle/allatonce.qml
@@ -52,21 +52,21 @@ Rectangle{
         sprites: [
             Sprite{
                 name: "licking"
-                source: "content/squarefacewhite.png"
+                source: "../images/squarefacewhite.png"
                 frames: 6
                 duration: 120
                 to: {"dying":1, "licking":5}
             },
             Sprite{
                 name: "dying"
-                source: "content/squarefacewhiteX.png"
+                source: "../images/squarefacewhiteX.png"
                 frames: 4
                 duration: 120
                 to: {"dead":1}
             },
             Sprite{
                 name: "dead"
-                source: "content/squarefacewhiteXX.png"
+                source: "../images/squarefacewhiteXX.png"
                 frames: 1
                 duration: 120
             }
@@ -74,7 +74,7 @@ Rectangle{
         colorVariation: 0.5
         rotationSpeedVariation: 360
         system: sys
-        colorTable: "../trails/content/colortable.png"
+        colorTable: "../trails/../images/colortable.png"
     }
     Friction{
         factor: 0.1
diff --git a/examples/declarative/particles/trails/rainbow.qml b/examples/declarative/particles/imageparticle/colortable.qml
index c0b61bf89e..b499b0733d 100644
--- a/examples/declarative/particles/trails/rainbow.qml
+++ b/examples/declarative/particles/imageparticle/colortable.qml
@@ -53,9 +53,9 @@ Rectangle {
         colorVariation: 0.5
         alpha: 0
 
-        source: "content/particle.png"
-        colorTable: "content/colortable.png"
-        sizeTable: "content/colortable.png"
+        source: "../images/particle.png"
+        colorTable: "../images/colortable.png"
+        sizeTable: "../images/colortable.png"
     }
     Emitter{
         system: particles
diff --git a/examples/declarative/particles/allsmiles/smilefactory.qml b/examples/declarative/particles/imageparticle/deformation.qml
index 4b01862f99..0fdeadf283 100644
--- a/examples/declarative/particles/allsmiles/smilefactory.qml
+++ b/examples/declarative/particles/imageparticle/deformation.qml
@@ -49,7 +49,7 @@ Rectangle{
     ImageParticle{
         system: sys
         groups: ["goingLeft", "goingRight"]
-        source: "content/singlesmile.png"
+        source: "../images/singlesmile.png"
         rotation: 90
         rotationSpeed: 90
         autoRotation: true
@@ -57,7 +57,7 @@ Rectangle{
     ImageParticle{
         system: sys
         groups: ["goingDown"]
-        source: "content/squarefacespriteXX.png"
+        source: "../images/squarefacespriteXX.png"
         yVector: PointDirection{ y: 0.5; yVariation: 0.25; xVariation: 0.25; }
         rotation: 180
     }
diff --git a/examples/declarative/particles/allsmiles/plain.qml b/examples/declarative/particles/imageparticle/rotation.qml
index ce7f3fb9f1..c7d950642b 100644
--- a/examples/declarative/particles/allsmiles/plain.qml
+++ b/examples/declarative/particles/imageparticle/rotation.qml
@@ -49,7 +49,7 @@ Rectangle{
     ImageParticle{
         id: up
         system: sys
-        source: "content/singlesmile.png"
+        source: "../images/smile.png"
     }
     Emitter{
         anchors.centerIn: parent
diff --git a/examples/declarative/particles/allsmiles/spritestateparticles.qml b/examples/declarative/particles/imageparticle/sprites.qml
index 06b78cdba4..a5afc61830 100644
--- a/examples/declarative/particles/allsmiles/spritestateparticles.qml
+++ b/examples/declarative/particles/imageparticle/sprites.qml
@@ -49,55 +49,55 @@ Rectangle{
     SpriteImage{
         sprites: [Sprite{
             name: "happy"
-            source: "content/squarefacesprite2.png"
+            source: "../images/squarefacesprite2.png"
             frames: 6
             duration: 120
             to: {"silly": 0.4, "sad": 0.2, "cyclops":0.1, "boggled":0.3, "dying":0.0}
         }, Sprite{
             name: "silly"
-            source: "content/squarefacesprite.png"
+            source: "../images/squarefacesprite.png"
             frames: 6
             duration: 120
             to: {"love": 0.4, "happy": 0.1, "evil": 0.2, "cyclops":0.1, "boggled":0.2}
         }, Sprite{
             name: "sad"
-            source: "content/squarefacesprite3.png"
+            source: "../images/squarefacesprite3.png"
             frames: 6
             duration: 120
             to: {"love" : 0.2, "evil": 0.2, "silly": 0.2, "cyclops":0.2, "boggled":0.2}
         }, Sprite{
             name: "cyclops"
-            source: "content/squarefacesprite4.png"
+            source: "../images/squarefacesprite4.png"
             frames: 6
             duration: 120
             to: {"love": 0.1, "evil": 0.1, "silly":0.1, "boggled":0.1, "cyclops" : 1.0}
         }, Sprite{
             name: "evil"
-            source: "content/squarefacesprite5.png"
+            source: "../images/squarefacesprite5.png"
             frames: 6
             duration: 120
             to: {"happy": 1.0}
         }, Sprite{
             name: "love"
-            source: "content/squarefacesprite6.png"
+            source: "../images/squarefacesprite6.png"
             frames: 6
             duration: 120
             to: {"sad": 0.6, "evil":0.4, "boggled":0.2}
         }, Sprite{
             name: "boggled"
-            source: "content/squarefacesprite7.png"
+            source: "../images/squarefacesprite7.png"
             frames: 6
             duration: 120
             to: {"love" : 0.2, "evil": 0.2, "silly": 0.2, "cyclops":0.1, "sad":0.2}
         }, Sprite{
             name: "dying"
-            source: "content/squarefacespriteX.png"
+            source: "../images/squarefacespriteX.png"
             frames: 4
             duration: 120
             to: {"dead":1.0}
         }, Sprite{
             name: "dead"
-            source: "content/squarefacespriteXX.png"
+            source: "../images/squarefacespriteXX.png"
             frames: 1
             duration: 10000
         }]
@@ -115,55 +115,55 @@ Rectangle{
         system: sys
         sprites: [Sprite{
             name: "happy"
-            source: "content/squarefacesprite2.png"
+            source: "../images/squarefacesprite2.png"
             frames: 6
             duration: 120
             to: {"silly": 0.4, "sad": 0.2, "cyclops":0.1, "boggled":0.3, "dying":0.0}
         }, Sprite{
             name: "silly"
-            source: "content/squarefacesprite.png"
+            source: "../images/squarefacesprite.png"
             frames: 6
             duration: 120
             to: {"love": 0.4, "happy": 0.1, "evil": 0.2, "cyclops":0.1, "boggled":0.2}
         }, Sprite{
             name: "sad"
-            source: "content/squarefacesprite3.png"
+            source: "../images/squarefacesprite3.png"
             frames: 6
             duration: 120
             to: {"love" : 0.2, "evil": 0.2, "silly": 0.2, "cyclops":0.2, "boggled":0.2}
         }, Sprite{
             name: "cyclops"
-            source: "content/squarefacesprite4.png"
+            source: "../images/squarefacesprite4.png"
             frames: 6
             duration: 120
             to: {"love": 0.1, "evil": 0.1, "silly":0.1, "boggled":0.1, "cyclops" : 1.0}
         }, Sprite{
             name: "evil"
-            source: "content/squarefacesprite5.png"
+            source: "../images/squarefacesprite5.png"
             frames: 6
             duration: 120
             to: {"happy": 1.0}
         }, Sprite{
             name: "love"
-            source: "content/squarefacesprite6.png"
+            source: "../images/squarefacesprite6.png"
             frames: 6
             duration: 120
             to: {"sad": 0.6, "evil":0.4, "boggled":0.2}
         }, Sprite{
             name: "boggled"
-            source: "content/squarefacesprite7.png"
+            source: "../images/squarefacesprite7.png"
             frames: 6
             duration: 120
             to: {"love" : 0.2, "evil": 0.2, "silly": 0.2, "cyclops":0.1, "sad":0.2}
         }, Sprite{
             name: "dying"
-            source: "content/squarefacespriteX.png"
+            source: "../images/squarefacespriteX.png"
             frames: 4
             duration: 120
             to: {"dead":1.0}
         }, Sprite{
             name: "dead"
-            source: "content/squarefacespriteXX.png"
+            source: "../images/squarefacespriteXX.png"
             frames: 1
             duration: 10000
         }]
diff --git a/examples/declarative/particles/asteroid/content/_explo.png b/examples/declarative/particles/images/_explo.png
index 4297245d49..4297245d49 100644
--- a/examples/declarative/particles/asteroid/content/_explo.png
+++ b/examples/declarative/particles/images/_explo.png
diff --git a/examples/declarative/particles/custom/content/backgroundLeaves.jpg b/examples/declarative/particles/images/backgroundLeaves.jpg
index 08be16751d..08be16751d 100755
--- a/examples/declarative/particles/custom/content/backgroundLeaves.jpg
+++ b/examples/declarative/particles/images/backgroundLeaves.jpg
diff --git a/examples/declarative/particles/trails/content/candle.png b/examples/declarative/particles/images/candle.png
index 8fa3193719..8fa3193719 100644
--- a/examples/declarative/particles/trails/content/candle.png
+++ b/examples/declarative/particles/images/candle.png
diff --git a/examples/declarative/particles/trails/content/colortable.png b/examples/declarative/particles/images/colortable.png
index a62ceeb4a0..a62ceeb4a0 100644
--- a/examples/declarative/particles/trails/content/colortable.png
+++ b/examples/declarative/particles/images/colortable.png
diff --git a/examples/declarative/particles/asteroid/content/finalfrontier.png b/examples/declarative/particles/images/finalfrontier.png
index 2ba1815230..2ba1815230 100644
--- a/examples/declarative/particles/asteroid/content/finalfrontier.png
+++ b/examples/declarative/particles/images/finalfrontier.png
diff --git a/examples/declarative/particles/launcherContent/icons/ultraparticles.png b/examples/declarative/particles/images/launcherIcons/allatonce.png
index 0d87eea427..0d87eea427 100644
--- a/examples/declarative/particles/launcherContent/icons/ultraparticles.png
+++ b/examples/declarative/particles/images/launcherIcons/allatonce.png
diff --git a/examples/declarative/particles/launcherContent/icons/blackhole.png b/examples/declarative/particles/images/launcherIcons/attractor.png
index 4bd8040c3b..4bd8040c3b 100644
--- a/examples/declarative/particles/launcherContent/icons/blackhole.png
+++ b/examples/declarative/particles/images/launcherIcons/attractor.png
diff --git a/examples/declarative/particles/launcherContent/icons/blurparticles.png b/examples/declarative/particles/images/launcherIcons/blurparticles.png
index 7a247ae46e..7a247ae46e 100644
--- a/examples/declarative/particles/launcherContent/icons/blurparticles.png
+++ b/examples/declarative/particles/images/launcherIcons/blurparticles.png
diff --git a/examples/declarative/particles/launcherContent/icons/close.png b/examples/declarative/particles/images/launcherIcons/close.png
index c37714ee8f..c37714ee8f 100644
--- a/examples/declarative/particles/launcherContent/icons/close.png
+++ b/examples/declarative/particles/images/launcherIcons/close.png
diff --git a/examples/declarative/particles/launcherContent/icons/rainbow.png b/examples/declarative/particles/images/launcherIcons/colortable.png
index 8841ea30f9..8841ea30f9 100644
--- a/examples/declarative/particles/launcherContent/icons/rainbow.png
+++ b/examples/declarative/particles/images/launcherIcons/colortable.png
diff --git a/examples/declarative/particles/launcherContent/icons/fallingleaves.png b/examples/declarative/particles/images/launcherIcons/customaffector.png
index d02e7918fa..d02e7918fa 100644
--- a/examples/declarative/particles/launcherContent/icons/fallingleaves.png
+++ b/examples/declarative/particles/images/launcherIcons/customaffector.png
diff --git a/examples/declarative/particles/launcherContent/icons/custom.png b/examples/declarative/particles/images/launcherIcons/customemitter.png
index 6d492573d1..6d492573d1 100644
--- a/examples/declarative/particles/launcherContent/icons/custom.png
+++ b/examples/declarative/particles/images/launcherIcons/customemitter.png
diff --git a/examples/declarative/particles/launcherContent/icons/smilefactory.png b/examples/declarative/particles/images/launcherIcons/deformation.png
index 78ea52790f..78ea52790f 100644
--- a/examples/declarative/particles/launcherContent/icons/smilefactory.png
+++ b/examples/declarative/particles/images/launcherIcons/deformation.png
diff --git a/examples/declarative/particles/launcherContent/icons/delegates.png b/examples/declarative/particles/images/launcherIcons/delegates.png
index 929414cd0e..929414cd0e 100644
--- a/examples/declarative/particles/launcherContent/icons/delegates.png
+++ b/examples/declarative/particles/images/launcherIcons/delegates.png
diff --git a/examples/declarative/particles/launcherContent/icons/dynamicemitters.png b/examples/declarative/particles/images/launcherIcons/dynamicemitters.png
index 0cdef9d21e..0cdef9d21e 100644
--- a/examples/declarative/particles/launcherContent/icons/dynamicemitters.png
+++ b/examples/declarative/particles/images/launcherIcons/dynamicemitters.png
diff --git a/examples/declarative/particles/launcherContent/icons/spriteparticles.png b/examples/declarative/particles/images/launcherIcons/emitmask.png
index 5603964939..5603964939 100644
--- a/examples/declarative/particles/launcherContent/icons/spriteparticles.png
+++ b/examples/declarative/particles/images/launcherIcons/emitmask.png
diff --git a/examples/declarative/particles/launcherContent/icons/flickr.png b/examples/declarative/particles/images/launcherIcons/flickr.png
index 4de2650280..4de2650280 100644
--- a/examples/declarative/particles/launcherContent/icons/flickr.png
+++ b/examples/declarative/particles/images/launcherIcons/flickr.png
diff --git a/examples/declarative/particles/launcherContent/icons/shader.png b/examples/declarative/particles/images/launcherIcons/fragmentshader.png
index 7c6de498d5..7c6de498d5 100644
--- a/examples/declarative/particles/launcherContent/icons/shader.png
+++ b/examples/declarative/particles/images/launcherIcons/fragmentshader.png
diff --git a/examples/declarative/particles/launcherContent/icons/gridsplosion.png b/examples/declarative/particles/images/launcherIcons/gridsplosion.png
index ec75453df6..ec75453df6 100644
--- a/examples/declarative/particles/launcherContent/icons/gridsplosion.png
+++ b/examples/declarative/particles/images/launcherIcons/gridsplosion.png
diff --git a/examples/declarative/particles/launcherContent/icons/combustion.png b/examples/declarative/particles/images/launcherIcons/groupgoal.png
index 69c6f64e54..69c6f64e54 100644
--- a/examples/declarative/particles/launcherContent/icons/combustion.png
+++ b/examples/declarative/particles/images/launcherIcons/groupgoal.png
diff --git a/examples/declarative/particles/launcherContent/icons/smile.png b/examples/declarative/particles/images/launcherIcons/imagecolors.png
index f990e6c03e..f990e6c03e 100644
--- a/examples/declarative/particles/launcherContent/icons/smile.png
+++ b/examples/declarative/particles/images/launcherIcons/imagecolors.png
diff --git a/examples/declarative/particles/launcherContent/icons/list.png b/examples/declarative/particles/images/launcherIcons/list.png
index bc13263cff..bc13263cff 100644
--- a/examples/declarative/particles/launcherContent/icons/list.png
+++ b/examples/declarative/particles/images/launcherIcons/list.png
diff --git a/examples/declarative/particles/launcherContent/icons/overburst.png b/examples/declarative/particles/images/launcherIcons/maximumemitted.png
index 4ef0435991..4ef0435991 100644
--- a/examples/declarative/particles/launcherContent/icons/overburst.png
+++ b/examples/declarative/particles/images/launcherIcons/maximumemitted.png
diff --git a/examples/declarative/particles/launcherContent/icons/layered.png b/examples/declarative/particles/images/launcherIcons/multiplepainters.png
index a28e3c4f02..a28e3c4f02 100644
--- a/examples/declarative/particles/launcherContent/icons/layered.png
+++ b/examples/declarative/particles/images/launcherIcons/multiplepainters.png
diff --git a/examples/declarative/particles/launcherContent/icons/package.png b/examples/declarative/particles/images/launcherIcons/package.png
index eba8951c26..eba8951c26 100644
--- a/examples/declarative/particles/launcherContent/icons/package.png
+++ b/examples/declarative/particles/images/launcherIcons/package.png
diff --git a/examples/declarative/particles/launcherContent/icons/stream.png b/examples/declarative/particles/images/launcherIcons/particleview.png
index a74f9a0340..a74f9a0340 100644
--- a/examples/declarative/particles/launcherContent/icons/stream.png
+++ b/examples/declarative/particles/images/launcherIcons/particleview.png
diff --git a/examples/declarative/particles/launcherContent/icons/plasmapatrol.png b/examples/declarative/particles/images/launcherIcons/plasmapatrol.png
index fda852b420..fda852b420 100644
--- a/examples/declarative/particles/launcherContent/icons/plasmapatrol.png
+++ b/examples/declarative/particles/images/launcherIcons/plasmapatrol.png
diff --git a/examples/declarative/particles/launcherContent/icons/remove.png b/examples/declarative/particles/images/launcherIcons/remove.png
index c37714ee8f..c37714ee8f 100644
--- a/examples/declarative/particles/launcherContent/icons/remove.png
+++ b/examples/declarative/particles/images/launcherIcons/remove.png
diff --git a/examples/declarative/particles/launcherContent/icons/plain.png b/examples/declarative/particles/images/launcherIcons/rotation.png
index dd51498514..dd51498514 100644
--- a/examples/declarative/particles/launcherContent/icons/plain.png
+++ b/examples/declarative/particles/images/launcherIcons/rotation.png
diff --git a/examples/declarative/particles/launcherContent/icons/samegame.png b/examples/declarative/particles/images/launcherIcons/samegame.png
index d00698264b..d00698264b 100644
--- a/examples/declarative/particles/launcherContent/icons/samegame.png
+++ b/examples/declarative/particles/images/launcherIcons/samegame.png
diff --git a/examples/declarative/particles/launcherContent/icons/portal.png b/examples/declarative/particles/images/launcherIcons/shapeanddirection.png
index 9c1f910d0c..9c1f910d0c 100644
--- a/examples/declarative/particles/launcherContent/icons/portal.png
+++ b/examples/declarative/particles/images/launcherIcons/shapeanddirection.png
diff --git a/examples/declarative/particles/launcherContent/icons/spaceexplorer.png b/examples/declarative/particles/images/launcherIcons/spaceexplorer.png
index 770584a0fa..770584a0fa 100644
--- a/examples/declarative/particles/launcherContent/icons/spaceexplorer.png
+++ b/examples/declarative/particles/images/launcherIcons/spaceexplorer.png
diff --git a/examples/declarative/particles/launcherContent/icons/asteroid.png b/examples/declarative/particles/images/launcherIcons/spritegoal.png
index 77480c6f09..77480c6f09 100644
--- a/examples/declarative/particles/launcherContent/icons/asteroid.png
+++ b/examples/declarative/particles/images/launcherIcons/spritegoal.png
diff --git a/examples/declarative/particles/launcherContent/icons/spritestateparticles.png b/examples/declarative/particles/images/launcherIcons/sprites.png
index dd01518ac4..dd01518ac4 100644
--- a/examples/declarative/particles/launcherContent/icons/spritestateparticles.png
+++ b/examples/declarative/particles/images/launcherIcons/sprites.png
diff --git a/examples/declarative/particles/launcherContent/icons/spritevariedparticles.png b/examples/declarative/particles/images/launcherIcons/spritevariedparticles.png
index 495bb6beee..495bb6beee 100644
--- a/examples/declarative/particles/launcherContent/icons/spritevariedparticles.png
+++ b/examples/declarative/particles/images/launcherIcons/spritevariedparticles.png
diff --git a/examples/declarative/particles/launcherContent/icons/shimmer.png b/examples/declarative/particles/images/launcherIcons/startstop.png
index 0ff53196a6..0ff53196a6 100644
--- a/examples/declarative/particles/launcherContent/icons/shimmer.png
+++ b/examples/declarative/particles/images/launcherIcons/startstop.png
diff --git a/examples/declarative/particles/launcherContent/icons/fireworks.png b/examples/declarative/particles/images/launcherIcons/timedgroupchanges.png
index ec9f826495..ec9f826495 100644
--- a/examples/declarative/particles/launcherContent/icons/fireworks.png
+++ b/examples/declarative/particles/images/launcherIcons/timedgroupchanges.png
diff --git a/examples/declarative/particles/launcherContent/icons/fireballs.png b/examples/declarative/particles/images/launcherIcons/trailemitter.png
index 39acf8b40d..39acf8b40d 100644
--- a/examples/declarative/particles/launcherContent/icons/fireballs.png
+++ b/examples/declarative/particles/images/launcherIcons/trailemitter.png
diff --git a/examples/declarative/particles/launcherContent/icons/trails.png b/examples/declarative/particles/images/launcherIcons/trails.png
index 0337ebcfd8..0337ebcfd8 100644
--- a/examples/declarative/particles/launcherContent/icons/trails.png
+++ b/examples/declarative/particles/images/launcherIcons/trails.png
diff --git a/examples/declarative/particles/launcherContent/icons/turbulence.png b/examples/declarative/particles/images/launcherIcons/turbulence.png
index 2b9446ea90..2b9446ea90 100644
--- a/examples/declarative/particles/launcherContent/icons/turbulence.png
+++ b/examples/declarative/particles/images/launcherIcons/turbulence.png
diff --git a/examples/declarative/particles/launcherContent/icons/velocityfrommotion.png b/examples/declarative/particles/images/launcherIcons/velocityfrommotion.png
index 79baa08293..79baa08293 100644
--- a/examples/declarative/particles/launcherContent/icons/velocityfrommotion.png
+++ b/examples/declarative/particles/images/launcherIcons/velocityfrommotion.png
diff --git a/examples/declarative/particles/launcherContent/icons/snow.png b/examples/declarative/particles/images/launcherIcons/wander.png
index d98e14b8ae..d98e14b8ae 100644
--- a/examples/declarative/particles/launcherContent/icons/snow.png
+++ b/examples/declarative/particles/images/launcherIcons/wander.png
diff --git a/examples/declarative/particles/trails/content/matchmask.png b/examples/declarative/particles/images/matchmask.png
index e575875c55..e575875c55 100644
--- a/examples/declarative/particles/trails/content/matchmask.png
+++ b/examples/declarative/particles/images/matchmask.png
diff --git a/examples/declarative/particles/asteroid/content/meteor.png b/examples/declarative/particles/images/meteor.png
index e8c368aea7..e8c368aea7 100644
--- a/examples/declarative/particles/asteroid/content/meteor.png
+++ b/examples/declarative/particles/images/meteor.png
diff --git a/examples/declarative/particles/asteroid/content/meteor_explo.png b/examples/declarative/particles/images/meteor_explo.png
index e659bfe2cf..e659bfe2cf 100644
--- a/examples/declarative/particles/asteroid/content/meteor_explo.png
+++ b/examples/declarative/particles/images/meteor_explo.png
diff --git a/examples/declarative/particles/asteroid/content/meteors.png b/examples/declarative/particles/images/meteors.png
index bada8a1407..bada8a1407 100644
--- a/examples/declarative/particles/asteroid/content/meteors.png
+++ b/examples/declarative/particles/images/meteors.png
diff --git a/examples/declarative/particles/asteroid/content/nullRock.png b/examples/declarative/particles/images/nullRock.png
index 4076327a1a..4076327a1a 100644
--- a/examples/declarative/particles/asteroid/content/nullRock.png
+++ b/examples/declarative/particles/images/nullRock.png
diff --git a/examples/declarative/particles/allsmiles/content/particle.png b/examples/declarative/particles/images/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/particles/allsmiles/content/particle.png
+++ b/examples/declarative/particles/images/particle.png
diff --git a/examples/declarative/particles/trails/content/particle2.png b/examples/declarative/particles/images/particle2.png
index 36349c6c6e..36349c6c6e 100644
--- a/examples/declarative/particles/trails/content/particle2.png
+++ b/examples/declarative/particles/images/particle2.png
diff --git a/examples/declarative/particles/trails/content/particle3.png b/examples/declarative/particles/images/particle3.png
index 905d8f37b8..905d8f37b8 100644
--- a/examples/declarative/particles/trails/content/particle3.png
+++ b/examples/declarative/particles/images/particle3.png
diff --git a/examples/declarative/particles/asteroid/content/particle4.png b/examples/declarative/particles/images/particle4.png
index bc95b703c1..bc95b703c1 100644
--- a/examples/declarative/particles/asteroid/content/particle4.png
+++ b/examples/declarative/particles/images/particle4.png
diff --git a/examples/declarative/particles/trails/content/particleA.png b/examples/declarative/particles/images/particleA.png
index c63acdee1f..c63acdee1f 100644
--- a/examples/declarative/particles/trails/content/particleA.png
+++ b/examples/declarative/particles/images/particleA.png
diff --git a/examples/declarative/particles/trails/content/portal_bg.png b/examples/declarative/particles/images/portal_bg.png
index 3c59eeabb9..3c59eeabb9 100644
--- a/examples/declarative/particles/trails/content/portal_bg.png
+++ b/examples/declarative/particles/images/portal_bg.png
diff --git a/examples/declarative/particles/custom/content/realLeaf1.png b/examples/declarative/particles/images/realLeaf1.png
index 6cabf29efd..6cabf29efd 100644
--- a/examples/declarative/particles/custom/content/realLeaf1.png
+++ b/examples/declarative/particles/images/realLeaf1.png
diff --git a/examples/declarative/particles/custom/content/realLeaf2.png b/examples/declarative/particles/images/realLeaf2.png
index bfeca861d5..bfeca861d5 100644
--- a/examples/declarative/particles/custom/content/realLeaf2.png
+++ b/examples/declarative/particles/images/realLeaf2.png
diff --git a/examples/declarative/particles/custom/content/realLeaf3.png b/examples/declarative/particles/images/realLeaf3.png
index b1071e862b..b1071e862b 100644
--- a/examples/declarative/particles/custom/content/realLeaf3.png
+++ b/examples/declarative/particles/images/realLeaf3.png
diff --git a/examples/declarative/particles/custom/content/realLeaf4.png b/examples/declarative/particles/images/realLeaf4.png
index d61d53d10e..d61d53d10e 100644
--- a/examples/declarative/particles/custom/content/realLeaf4.png
+++ b/examples/declarative/particles/images/realLeaf4.png
diff --git a/examples/declarative/particles/asteroid/content/rocket.png b/examples/declarative/particles/images/rocket.png
index a171610b03..a171610b03 100644
--- a/examples/declarative/particles/asteroid/content/rocket.png
+++ b/examples/declarative/particles/images/rocket.png
diff --git a/examples/declarative/particles/asteroid/content/rocket2.png b/examples/declarative/particles/images/rocket2.png
index 7110f8fdc6..7110f8fdc6 100644
--- a/examples/declarative/particles/asteroid/content/rocket2.png
+++ b/examples/declarative/particles/images/rocket2.png
diff --git a/examples/declarative/particles/allsmiles/content/singlesmile.png b/examples/declarative/particles/images/singlesmile.png
index 4087fa6b7f..4087fa6b7f 100644
--- a/examples/declarative/particles/allsmiles/content/singlesmile.png
+++ b/examples/declarative/particles/images/singlesmile.png
diff --git a/examples/declarative/particles/allsmiles/content/sizeInOut.png b/examples/declarative/particles/images/sizeInOut.png
index 0a306ea21a..0a306ea21a 100644
--- a/examples/declarative/particles/allsmiles/content/sizeInOut.png
+++ b/examples/declarative/particles/images/sizeInOut.png
diff --git a/examples/declarative/particles/custom/content/smile.png b/examples/declarative/particles/images/smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/particles/custom/content/smile.png
+++ b/examples/declarative/particles/images/smile.png
diff --git a/examples/declarative/particles/allsmiles/content/smileMask.png b/examples/declarative/particles/images/smileMask.png
index 65a0143e9e..65a0143e9e 100644
--- a/examples/declarative/particles/allsmiles/content/smileMask.png
+++ b/examples/declarative/particles/images/smileMask.png
diff --git a/examples/declarative/particles/snow/content/flake-01.png b/examples/declarative/particles/images/snowflake.png
index 490887a82f..490887a82f 100644
--- a/examples/declarative/particles/snow/content/flake-01.png
+++ b/examples/declarative/particles/images/snowflake.png
diff --git a/examples/declarative/particles/trails/content/sparkleSize.png b/examples/declarative/particles/images/sparkleSize.png
index 752056541b..752056541b 100644
--- a/examples/declarative/particles/trails/content/sparkleSize.png
+++ b/examples/declarative/particles/images/sparkleSize.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacesprite.png b/examples/declarative/particles/images/squarefacesprite.png
index f9a5d5fcce..f9a5d5fcce 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacesprite.png
+++ b/examples/declarative/particles/images/squarefacesprite.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacesprite2.png b/examples/declarative/particles/images/squarefacesprite2.png
index 7106a520a4..7106a520a4 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacesprite2.png
+++ b/examples/declarative/particles/images/squarefacesprite2.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacesprite3.png b/examples/declarative/particles/images/squarefacesprite3.png
index f4e6f26856..f4e6f26856 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacesprite3.png
+++ b/examples/declarative/particles/images/squarefacesprite3.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacesprite4.png b/examples/declarative/particles/images/squarefacesprite4.png
index 1e094eed4a..1e094eed4a 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacesprite4.png
+++ b/examples/declarative/particles/images/squarefacesprite4.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacesprite5.png b/examples/declarative/particles/images/squarefacesprite5.png
index 1cfc5c7f8c..1cfc5c7f8c 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacesprite5.png
+++ b/examples/declarative/particles/images/squarefacesprite5.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacesprite6.png b/examples/declarative/particles/images/squarefacesprite6.png
index b040139a9e..b040139a9e 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacesprite6.png
+++ b/examples/declarative/particles/images/squarefacesprite6.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacesprite7.png b/examples/declarative/particles/images/squarefacesprite7.png
index b1e5e4e339..b1e5e4e339 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacesprite7.png
+++ b/examples/declarative/particles/images/squarefacesprite7.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacespriteX.png b/examples/declarative/particles/images/squarefacespriteX.png
index 93a0181dd0..93a0181dd0 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacespriteX.png
+++ b/examples/declarative/particles/images/squarefacespriteX.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacespriteXX.png b/examples/declarative/particles/images/squarefacespriteXX.png
index 3159efe246..3159efe246 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacespriteXX.png
+++ b/examples/declarative/particles/images/squarefacespriteXX.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacewhite.png b/examples/declarative/particles/images/squarefacewhite.png
index 02259c5762..02259c5762 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacewhite.png
+++ b/examples/declarative/particles/images/squarefacewhite.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacewhiteX.png b/examples/declarative/particles/images/squarefacewhiteX.png
index 59af205c6b..59af205c6b 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacewhiteX.png
+++ b/examples/declarative/particles/images/squarefacewhiteX.png
diff --git a/examples/declarative/particles/allsmiles/content/squarefacewhiteXX.png b/examples/declarative/particles/images/squarefacewhiteXX.png
index b0f15c6785..b0f15c6785 100644
--- a/examples/declarative/particles/allsmiles/content/squarefacewhiteXX.png
+++ b/examples/declarative/particles/images/squarefacewhiteXX.png
diff --git a/examples/declarative/particles/asteroid/content/star.png b/examples/declarative/particles/images/star.png
index 0d592cfa87..0d592cfa87 100644
--- a/examples/declarative/particles/asteroid/content/star.png
+++ b/examples/declarative/particles/images/star.png
diff --git a/examples/declarative/particles/itemparticle/content/Delegate.qml b/examples/declarative/particles/itemparticle/content/Delegate.qml
new file mode 100644
index 0000000000..ae1dffb63b
--- /dev/null
+++ b/examples/declarative/particles/itemparticle/content/Delegate.qml
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+//![0]
+Package {
+    Text { id: listDelegate; width: 200; height: 25; text: 'Empty'; Package.name: 'list' }
+    Text { id: gridDelegate; width: 100; height: 50; text: 'Empty'; Package.name: 'grid' }
+
+    Rectangle {
+        id: wrapper
+        width: 200; height: 25
+        color: 'lightsteelblue'
+
+        Text { text: display; anchors.centerIn: parent }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                if (wrapper.state == 'inList')
+                    wrapper.state = 'inGrid';
+                else
+                    wrapper.state = 'inList';
+            }
+        }
+
+        state: 'inList'
+        states: [
+            State {
+                name: 'inList'
+                ParentChange { target: wrapper; parent: listDelegate }
+            },
+            State {
+                name: 'inGrid'
+                ParentChange {
+                    target: wrapper; parent: gridDelegate
+                    x: 0; y: 0; width: gridDelegate.width; height: gridDelegate.height
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                ParentAnimation {
+                    NumberAnimation { properties: 'x,y,width,height'; duration: 300 }
+                }
+            }
+        ]
+    }
+}
+//![0]
diff --git a/examples/declarative/particles/itemparticle/content/Delegate2.qml b/examples/declarative/particles/itemparticle/content/Delegate2.qml
new file mode 100644
index 0000000000..a05fa348b9
--- /dev/null
+++ b/examples/declarative/particles/itemparticle/content/Delegate2.qml
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+//![0]
+Package {
+    Item { id: gridDelegate; width: w; height: h; Package.name: 'grid' }
+    Item { id: particleDelegate; width: w; height: h; Package.name: 'particles' 
+
+        Rectangle {
+            id: wrapper
+            width: w; height: h;
+            color: col
+            rotation: Math.random()*360
+            Behavior on rotation{RotationAnimation{}}
+
+            states: State{
+                name: "gridded"
+                when: root.inGrid
+                PropertyChanges{
+                    target: wrapper
+                    rotation: 0
+                }
+                ParentChange{
+                    target: wrapper
+                    parent: gridDelegate
+                    x:0
+                    y:0
+                }
+            }
+            transitions: [
+                Transition {
+                    ParentAnimation {
+                        NumberAnimation { properties: 'x,y,width,height'; duration: 300 }
+                    }
+                }
+            ]
+        }
+    }
+}
+//![0]
diff --git a/examples/declarative/particles/itemparticle/content/ExpandingDelegate.qml b/examples/declarative/particles/itemparticle/content/ExpandingDelegate.qml
new file mode 100644
index 0000000000..e6fcb6dcf7
--- /dev/null
+++ b/examples/declarative/particles/itemparticle/content/ExpandingDelegate.qml
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../../../modelviews/listview/content"
+
+// This example illustrates expanding a list item to show a more detailed view.
+
+    // Delegate for the recipes.  This delegate has two modes:
+    // 1. List mode (default), which just shows the picture and title of the recipe.
+    // 2. Details mode, which also shows the ingredients and method.
+    Component {
+        id: recipeDelegate
+
+        Item {
+            id: recipe
+
+            // Create a property to contain the visibility of the details.
+            // We can bind multiple element's opacity to this one property,
+            // rather than having a "PropertyChanges" line for each element we
+            // want to fade.
+            property real detailsOpacity : 0
+
+            //this bit changed for aesthetics
+            width: 70
+            height: 70
+            // A simple rounded rectangle for the background
+            Rectangle {
+                id: background
+                x: 2; y: 2; width: parent.width - x*2; height: parent.height - y*2
+                color: "ivory"
+                border.color: "orange"
+                radius: 5
+            }
+            Image{
+                anchors.fill:parent
+                anchors.margins: -32
+                source: "bubble.png"
+            }
+
+
+            // This mouse region covers the entire delegate.
+            // When clicked it changes mode to 'Details'.  If we are already
+            // in Details mode, then no change will happen.
+            MouseArea {
+                anchors.fill: parent
+                onClicked: recipe.state = 'Details';
+            }
+
+            // Lay out the page: picture, title and ingredients at the top, and method at the
+            // bottom.  Note that elements that should not be visible in the list
+            // mode have their opacity set to recipe.detailsOpacity.
+            Row {
+                id: topLayout
+                x: 10; y: 10; height: recipeImage.height; width: parent.width
+                spacing: 10
+
+                Image {
+                    id: recipeImage
+                    width: 50; height: 50
+                    source: "../../modelviews/listview/" + picture
+                }
+
+                Column {
+                    width: background.width - recipeImage.width - 20; height: recipeImage.height
+                    spacing: 5
+
+                    Text { 
+                        text: title
+                        font.bold: true; font.pointSize: 16
+                    }
+
+                    Text {
+                        text: "Ingredients"
+                        font.pointSize: 12; font.bold: true
+                        opacity: recipe.detailsOpacity
+                    }
+
+                    Text {
+                        text: ingredients
+                        wrapMode: Text.WordWrap
+                        width: parent.width
+                        opacity: recipe.detailsOpacity
+                    }
+                }
+            }
+
+            Item {
+                id: details
+                x: 10; width: parent.width - 20
+                anchors { top: topLayout.bottom; topMargin: 10; bottom: parent.bottom; bottomMargin: 10 }
+                opacity: recipe.detailsOpacity
+
+                Text {
+                    id: methodTitle
+                    anchors.top: parent.top
+                    text: "Method"
+                    font.pointSize: 12; font.bold: true
+                }
+
+                Flickable {
+                    id: flick
+                    width: parent.width
+                    anchors { top: methodTitle.bottom; bottom: parent.bottom }
+                    contentHeight: methodText.height
+                    clip: true
+
+                    Text { id: methodText; text: method; wrapMode: Text.WordWrap; width: details.width }
+                }
+
+                Image {
+                    anchors { right: flick.right; top: flick.top }
+                    source: "../../modelviews/listview/" + "content/pics/moreUp.png"
+                    opacity: flick.atYBeginning ? 0 : 1
+                }
+
+                Image {
+                    anchors { right: flick.right; bottom: flick.bottom }
+                    source: "../../modelviews/listview/" + "content/pics/moreDown.png"
+                    opacity: flick.atYEnd ? 0 : 1
+                }
+            }
+
+            // A button to close the detailed view, i.e. set the state back to default ('').
+            TextButton {
+                y: 10
+                anchors { right: background.right; rightMargin: 10 }
+                opacity: recipe.detailsOpacity
+                text: "Close"
+
+                onClicked: recipe.state = '';
+            }
+
+            states: State {
+                name: "Details"
+
+                PropertyChanges { target: background; color: "white" }
+                PropertyChanges { target: recipeImage; width: 130; height: 130 } // Make picture bigger
+                PropertyChanges { target: recipe; detailsOpacity: 1; x: 0; opacity: 1 } // Make details visible
+                PropertyChanges { target: recipe; height: root.height; width: root.height; x:0; y:0; z:100} // Fill the entire list area with the detailed view
+
+                // Move the list so that this item is at the top.
+                //PropertyChanges { target: recipe.ListView.view; explicit: true; contentY: recipe.y }
+
+                // Disallow flicking while we're in detailed view
+                //PropertyChanges { target: recipe.ListView.view; interactive: false }
+            }
+
+            transitions: Transition {
+                //The only strictly necessary particle specific lines 
+                to: "Details"
+                reversible: true
+                ScriptAction{script:{
+                    if(state == "Details")
+                        mp.freeze(index);
+                    else
+                        mp.unfreeze(index);
+                    }
+                }
+                // Make the state changes smooth
+                ParallelAnimation {
+                    ColorAnimation { property: "color"; duration: 500 }
+                    NumberAnimation { duration: 300; properties: "detailsOpacity,opacity,x,y,height,width" }
+                }
+            }
+        }
+    }
diff --git a/examples/declarative/particles/itemparticle/content/RssModel.qml b/examples/declarative/particles/itemparticle/content/RssModel.qml
new file mode 100644
index 0000000000..edb3ceac42
--- /dev/null
+++ b/examples/declarative/particles/itemparticle/content/RssModel.qml
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+XmlListModel {
+    property string tags : ""
+
+    source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+tags+"&" : "")
+    query: "/feed/entry"
+    namespaceDeclarations: "declare default element namespace 'http://www.w3.org/2005/Atom';"
+
+    XmlRole { name: "title"; query: "title/string()" }
+    XmlRole { name: "content"; query: "content/string()" }
+    XmlRole { name: "hq"; query: "link[@rel='enclosure']/@href/string()" }
+}
diff --git a/examples/declarative/particles/itemparticle/content/bubble.png b/examples/declarative/particles/itemparticle/content/bubble.png
new file mode 100644
index 0000000000..c7f479e9e3
--- /dev/null
+++ b/examples/declarative/particles/itemparticle/content/bubble.png
diff --git a/examples/declarative/particles/itemparticle/content/script.js b/examples/declarative/particles/itemparticle/content/script.js
new file mode 100644
index 0000000000..e8ef93a847
--- /dev/null
+++ b/examples/declarative/particles/itemparticle/content/script.js
@@ -0,0 +1,27 @@
+.pragma library
+
+function getWidth(string) {
+    return (string.match(/width=\"([0-9]+)\"/))[1]
+}
+
+function getHeight(string) {
+    return (string.match(/height=\"([0-9]+)\"/))[1]
+}
+
+function getImagePath(string) {
+    var pattern = /src=\"http:\/\/(\S+)\"/
+    return (string.match(pattern))[1]
+}
+
+function calculateScale(width, height, cellSize) {
+    var widthScale = (cellSize * 1.0) / width
+    var heightScale = (cellSize * 1.0) / height
+    var scale = 0
+
+    if (widthScale <= heightScale) {
+        scale = widthScale;
+    } else if (heightScale < widthScale) {
+        scale = heightScale;
+    }
+    return scale;
+}
diff --git a/examples/declarative/particles/custom/delegates.qml b/examples/declarative/particles/itemparticle/delegates.qml
index 960a398fcb..960a398fcb 100644
--- a/examples/declarative/particles/custom/delegates.qml
+++ b/examples/declarative/particles/itemparticle/delegates.qml
diff --git a/examples/declarative/particles/itemparticle/particleview.qml b/examples/declarative/particles/itemparticle/particleview.qml
new file mode 100644
index 0000000000..fb529c5294
--- /dev/null
+++ b/examples/declarative/particles/itemparticle/particleview.qml
@@ -0,0 +1,275 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+import "content/script.js" as Script
+import "content"
+
+Item{
+    id: root
+    width: 640
+    height: 480
+    Rectangle{
+        anchors.fill: parent
+        color: "black"
+        z: -1
+    }
+    Item{
+        id: loading
+        Behavior on opacity{NumberAnimation{}}
+        anchors.fill: parent
+        Text{
+            anchors.centerIn: parent
+            text: "Loading"
+            color: "white"
+        }
+    }
+    ParticleSystem{ 
+        id: sys;
+        running: true
+    }
+    Emitter{
+        id: emitter
+        system: sys
+        height: parent.height - 132/2
+        x: -132/2
+        y: 132/2
+        speed: PointDirection{ x: 32; xVariation: 8 }
+        emitRate: 0.5
+        lifeSpan: Emitter.InfiniteLife
+        group: "photos"
+    }
+    Age{
+        system: sys
+        x: parent.width + 132/2
+        height: parent.height
+        width: 1000
+    }
+    ImageParticle{
+        system: sys
+        groups: ["fireworks"]
+        source: "../trails/../images/star.png"
+        color: "lightsteelblue"
+        alpha: 0
+        colorVariation: 0
+        z: 1000
+    }
+    ItemParticle{
+        id: mp
+        z: 0
+        system: sys
+        fade: false
+        groups: ["photos"]
+    }
+    Component{
+        id: alertDelegate
+        Rectangle{
+            width: 132
+            height: 132
+            NumberAnimation on scale{
+                running: true
+                loops: 1
+                from: 0.2
+                to: 1
+            }
+            Image{
+                source: "../asteroid/../images/rocket.png"
+                anchors.centerIn: parent
+            }
+            Text{
+                anchors.bottom: parent.bottom
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: "A new ship has arrived!"
+            }
+        }
+    }
+    property Item alertItem;
+    function alert(){
+        //resetter.active = false
+        force.active = true;
+        alertItem = alertDelegate.createObject(root);
+        alertItem.x = root.width/2 - alertItem.width/2
+        alertItem.y = root.height/2 - alertItem.height/2
+        spawnFireworks.pulse(0.2);
+        stopAlert.start();
+    }
+    focus: true
+    Keys.onSpacePressed: alert();
+    Timer{
+        id: stopAlert
+        running: false
+        repeat: false
+        interval: 800
+        onTriggered: {
+            force.active = false
+            //resetter.active = true;
+            mp.take(alertItem, true);
+            centerEmitter.burst(1);
+        }
+    }
+    Attractor{
+        id: force
+        system: sys
+        pointX: root.width/2
+        pointY: root.height/2
+        strength: -10000
+        enabled: false
+        anchors.centerIn: parent
+        width: parent.width/2
+        height: parent.height/2
+        groups:["photos"]
+        affectedParameter: Attractor.Position
+    }
+    Emitter{
+        id: centerEmitter
+        speed: 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
+        group: "photos"
+        system: sys
+        anchors.centerIn: parent
+        enabled: false
+
+        //TODO: Zoom in effect
+    }
+    Emitter{
+        id: spawnFireworks
+        group: "fireworks"
+        system: sys
+        maximumEmitted: 400
+        emitRate: 400
+        lifeSpan: 2800
+        x: parent.width/2
+        y: parent.height/2 - 64
+        width: 8
+        height: 8
+        enabled: false
+        size: 32
+        endSize: 8
+        speed: AngleDirection{ magnitude: 160; magnitudeVariation: 120; angleVariation: 90; angle: 270 }
+        acceleration: PointDirection{ y: 160 }
+    }
+    Item{ x: -1000; y: -1000 //offscreen
+        Repeater{//Load them here, add to system on completed
+            model: theModel
+            delegate: theDelegate
+        }
+    }
+    RssModel{id: theModel; tags:"particle,particles"}
+    Component {
+        id: theDelegate
+        Rectangle {
+            id: container
+            border.width: 2
+            property real myRand: Math.random();//'depth'
+            z: Math.floor(myRand * 100)
+            scale: (myRand + 1.0)/2;
+            //TODO: Darken based on 'depth'
+            width: 132
+            height: 132
+            //ItemParticle.onAttached: console.log("I'm in"  + x + "," + y + ":" + opacity);
+            ItemParticle.onDetached: mp.take(container);//respawns
+            function manage()
+            {
+                if(state == "selected"){
+                    console.log("Taking " + index);
+                    mp.freeze(container);
+                }else{
+                    console.log("Returning " +index);
+                    mp.unfreeze(container);
+                }
+            }
+            Image{
+                id: img
+                anchors.centerIn: parent
+                smooth: true; source: "http://" + Script.getImagePath(content); cache: true
+                fillMode: Image.PreserveAspectFit; 
+                width: parent.width-4; height: parent.height-4
+                onStatusChanged: if(img.status == Image.Ready){
+                    container.opacity = 0;
+                    loading.opacity = 0;
+                    mp.take(container);
+                }
+            }
+            Text{
+                anchors.bottom: parent.bottom
+                width: parent.width
+                horizontalAlignment: Text.AlignHCenter
+                elide: Text.ElideRight
+                text: title
+                color: "black"
+            }
+            MouseArea{
+                anchors.fill: parent
+                onClicked: container.state == "selected" ? container.state = "" : container.state = "selected"
+            }
+            states: State{
+                name: "selected"
+                ParentChange{
+                    target: container
+                    parent: root
+                    x: 0
+                    y: 0
+                }
+                PropertyChanges{
+                    target: container
+                    width: root.width
+                    height: root.height
+                    z: 101
+                    opacity: 1
+                    rotation: 0
+                }
+            }
+            transitions: Transition{
+                to: "selected"
+                reversible: true
+                SequentialAnimation{
+                    ScriptAction{script: container.manage();}
+                    ParallelAnimation{
+                        ParentAnimation{NumberAnimation{ properties: "x,y" }}//Doesn't work, particles takes control of x,y instantly
+                        NumberAnimation{ properties: "width, height, z, rotation" }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/plasmapatrol/PlasmaPatrol.qmlproject b/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject
index 53f5ecb8d2..53f5ecb8d2 100644
--- a/examples/declarative/plasmapatrol/PlasmaPatrol.qmlproject
+++ b/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject
diff --git a/examples/declarative/plasmapatrol/TODO b/examples/declarative/particles/plasmapatrol/TODO
index ef9d21a73d..ef9d21a73d 100644
--- a/examples/declarative/plasmapatrol/TODO
+++ b/examples/declarative/particles/plasmapatrol/TODO
diff --git a/examples/declarative/plasmapatrol/content/BlasterHardpoint.qml b/examples/declarative/particles/plasmapatrol/content/BlasterHardpoint.qml
index 3e751f4e15..3e751f4e15 100644
--- a/examples/declarative/plasmapatrol/content/BlasterHardpoint.qml
+++ b/examples/declarative/particles/plasmapatrol/content/BlasterHardpoint.qml
diff --git a/examples/declarative/plasmapatrol/content/Button.qml b/examples/declarative/particles/plasmapatrol/content/Button.qml
index 9ca7912037..9ca7912037 100644
--- a/examples/declarative/plasmapatrol/content/Button.qml
+++ b/examples/declarative/particles/plasmapatrol/content/Button.qml
diff --git a/examples/declarative/plasmapatrol/content/CannonHardpoint.qml b/examples/declarative/particles/plasmapatrol/content/CannonHardpoint.qml
index dc15f0cae1..dc15f0cae1 100644
--- a/examples/declarative/plasmapatrol/content/CannonHardpoint.qml
+++ b/examples/declarative/particles/plasmapatrol/content/CannonHardpoint.qml
diff --git a/examples/declarative/plasmapatrol/content/ChoiceBox.qml b/examples/declarative/particles/plasmapatrol/content/ChoiceBox.qml
index 8a4363d663..8a4363d663 100644
--- a/examples/declarative/plasmapatrol/content/ChoiceBox.qml
+++ b/examples/declarative/particles/plasmapatrol/content/ChoiceBox.qml
diff --git a/examples/declarative/plasmapatrol/content/Cruiser.qml b/examples/declarative/particles/plasmapatrol/content/Cruiser.qml
index a4983fc2a0..a4983fc2a0 100644
--- a/examples/declarative/plasmapatrol/content/Cruiser.qml
+++ b/examples/declarative/particles/plasmapatrol/content/Cruiser.qml
diff --git a/examples/declarative/plasmapatrol/content/Frigate.qml b/examples/declarative/particles/plasmapatrol/content/Frigate.qml
index f26e7e881c..f26e7e881c 100644
--- a/examples/declarative/plasmapatrol/content/Frigate.qml
+++ b/examples/declarative/particles/plasmapatrol/content/Frigate.qml
diff --git a/examples/declarative/plasmapatrol/content/Hardpoint.qml b/examples/declarative/particles/plasmapatrol/content/Hardpoint.qml
index c6af805856..c6af805856 100644
--- a/examples/declarative/plasmapatrol/content/Hardpoint.qml
+++ b/examples/declarative/particles/plasmapatrol/content/Hardpoint.qml
diff --git a/examples/declarative/plasmapatrol/content/HelpScreens.qml b/examples/declarative/particles/plasmapatrol/content/HelpScreens.qml
index c5ae949edd..c5ae949edd 100644
--- a/examples/declarative/plasmapatrol/content/HelpScreens.qml
+++ b/examples/declarative/particles/plasmapatrol/content/HelpScreens.qml
diff --git a/examples/declarative/plasmapatrol/content/LaserHardpoint.qml b/examples/declarative/particles/plasmapatrol/content/LaserHardpoint.qml
index 56fd91b5b3..56fd91b5b3 100644
--- a/examples/declarative/plasmapatrol/content/LaserHardpoint.qml
+++ b/examples/declarative/particles/plasmapatrol/content/LaserHardpoint.qml
diff --git a/examples/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml b/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml
index 7a8c3e61b3..7a8c3e61b3 100644
--- a/examples/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml
+++ b/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml
diff --git a/examples/declarative/plasmapatrol/content/SequentialLoader.qml b/examples/declarative/particles/plasmapatrol/content/SequentialLoader.qml
index 49c30cac4d..49c30cac4d 100644
--- a/examples/declarative/plasmapatrol/content/SequentialLoader.qml
+++ b/examples/declarative/particles/plasmapatrol/content/SequentialLoader.qml
diff --git a/examples/declarative/plasmapatrol/content/Ship.qml b/examples/declarative/particles/plasmapatrol/content/Ship.qml
index 60fc311d47..60fc311d47 100644
--- a/examples/declarative/plasmapatrol/content/Ship.qml
+++ b/examples/declarative/particles/plasmapatrol/content/Ship.qml
diff --git a/examples/declarative/plasmapatrol/content/Sloop.qml b/examples/declarative/particles/plasmapatrol/content/Sloop.qml
index 59678a75ea..59678a75ea 100644
--- a/examples/declarative/plasmapatrol/content/Sloop.qml
+++ b/examples/declarative/particles/plasmapatrol/content/Sloop.qml
diff --git a/examples/declarative/plasmapatrol/content/pics/TitleText.png b/examples/declarative/particles/plasmapatrol/content/pics/TitleText.png
index dc3acebe39..dc3acebe39 100644
--- a/examples/declarative/plasmapatrol/content/pics/TitleText.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/TitleText.png
diff --git a/examples/declarative/plasmapatrol/content/pics/blur-circle2.png b/examples/declarative/particles/plasmapatrol/content/pics/blur-circle2.png
index f7c9f3e98e..f7c9f3e98e 100644
--- a/examples/declarative/plasmapatrol/content/pics/blur-circle2.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/blur-circle2.png
diff --git a/examples/declarative/plasmapatrol/content/pics/blur-circle3.png b/examples/declarative/particles/plasmapatrol/content/pics/blur-circle3.png
index dbc39cb16e..dbc39cb16e 100644
--- a/examples/declarative/plasmapatrol/content/pics/blur-circle3.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/blur-circle3.png
diff --git a/examples/declarative/plasmapatrol/content/pics/finalfrontier.png b/examples/declarative/particles/plasmapatrol/content/pics/finalfrontier.png
index 2ba1815230..2ba1815230 100644
--- a/examples/declarative/plasmapatrol/content/pics/finalfrontier.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/finalfrontier.png
diff --git a/examples/declarative/plasmapatrol/content/pics/meteor.png b/examples/declarative/particles/plasmapatrol/content/pics/meteor.png
index e8c368aea7..e8c368aea7 100644
--- a/examples/declarative/plasmapatrol/content/pics/meteor.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/meteor.png
diff --git a/examples/declarative/plasmapatrol/content/pics/meteor_explo.png b/examples/declarative/particles/plasmapatrol/content/pics/meteor_explo.png
index 4297245d49..4297245d49 100644
--- a/examples/declarative/plasmapatrol/content/pics/meteor_explo.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/meteor_explo.png
diff --git a/examples/declarative/plasmapatrol/content/pics/nullRock.png b/examples/declarative/particles/plasmapatrol/content/pics/nullRock.png
index 4076327a1a..4076327a1a 100644
--- a/examples/declarative/plasmapatrol/content/pics/nullRock.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/nullRock.png
diff --git a/examples/declarative/particles/custom/content/particle.png b/examples/declarative/particles/plasmapatrol/content/pics/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/particles/custom/content/particle.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/particle.png
diff --git a/examples/declarative/particles/trails/content/star.png b/examples/declarative/particles/plasmapatrol/content/pics/star.png
index 0d592cfa87..0d592cfa87 100644
--- a/examples/declarative/particles/trails/content/star.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/star.png
diff --git a/examples/declarative/plasmapatrol/content/pics/star2.png b/examples/declarative/particles/plasmapatrol/content/pics/star2.png
index bb55c44788..bb55c44788 100644
--- a/examples/declarative/plasmapatrol/content/pics/star2.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/star2.png
diff --git a/examples/declarative/plasmapatrol/content/pics/star3.png b/examples/declarative/particles/plasmapatrol/content/pics/star3.png
index 636a25f480..636a25f480 100644
--- a/examples/declarative/plasmapatrol/content/pics/star3.png
+++ b/examples/declarative/particles/plasmapatrol/content/pics/star3.png
diff --git a/examples/declarative/plasmapatrol/plasmapatrol.qml b/examples/declarative/particles/plasmapatrol/plasmapatrol.qml
index 2fa9f44929..bc5f49678c 100644
--- a/examples/declarative/plasmapatrol/plasmapatrol.qml
+++ b/examples/declarative/particles/plasmapatrol/plasmapatrol.qml
@@ -71,7 +71,7 @@ Rectangle {
         //General Children
         Image{
             anchors.centerIn: parent
-            source: "content/pics/finalfrontier.png"
+            source: "../images/pics/finalfrontier.png"
         }
         ParticleSystem{
             id: particles
@@ -100,7 +100,7 @@ Rectangle {
                         group: "default"
                         emitRate: 1200
                         lifeSpan: 1200
-                        shape: MaskShape{source:"content/pics/TitleText.png"}
+                        shape: MaskShape{source:"../images/pics/TitleText.png"}
                         size: 16
                         endSize: 0
                         sizeVariation: 8
diff --git a/examples/declarative/particles/trails/dynamicemitters.qml b/examples/declarative/particles/simple/dynamicemitters.qml
index dac5d93035..89e811e199 100644
--- a/examples/declarative/particles/trails/dynamicemitters.qml
+++ b/examples/declarative/particles/simple/dynamicemitters.qml
@@ -51,7 +51,7 @@ Rectangle{
     }
     ImageParticle{
         system: sys
-        source: "content/particle.png"
+        source: "../images/particle.png"
         color: "white"
         colorVariation: 1.0
         alpha: 0.1
diff --git a/examples/declarative/particles/trails/layered.qml b/examples/declarative/particles/simple/multiplepainters.qml
index 9af5f0bd64..a94efb749e 100644
--- a/examples/declarative/particles/trails/layered.qml
+++ b/examples/declarative/particles/simple/multiplepainters.qml
@@ -66,13 +66,13 @@ Rectangle{
     ImageParticle{
         system: sys
         visible: !cloneMode
-        source: "content/particle2.png"
+        source: "../images/particle2.png"
     }
     ImageParticle{
         system: sys
         visible: cloneMode
         z: 0
-        source: "content/particle3.png"
+        source: "../images/particle3.png"
     }
     ImageParticle{
         system: sys
@@ -82,6 +82,6 @@ Rectangle{
         height: 240
         width: root.width
         z: 1
-        source: "content/particle.png"
+        source: "../images/particle.png"
     }
 }
diff --git a/examples/declarative/particles/trails/shimmer.qml b/examples/declarative/particles/simple/startstop.qml
index 90b47bc6b7..bab3f5fdee 100644
--- a/examples/declarative/particles/trails/shimmer.qml
+++ b/examples/declarative/particles/simple/startstop.qml
@@ -62,8 +62,8 @@ Rectangle{
     ImageParticle{
         anchors.fill: parent
         system: particles
-        source: "content/star.png"
-        sizeTable: "content/sparkleSize.png"
+        source: "../images/star.png"
+        sizeTable: "../images/sparkleSize.png"
         alpha: 0
         colorVariation: 0.6
     }
diff --git a/examples/declarative/particles/trails/content/PetsModel.qml b/examples/declarative/particles/trails/content/PetsModel.qml
deleted file mode 100644
index e55d274fa2..0000000000
--- a/examples/declarative/particles/trails/content/PetsModel.qml
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-ListModel {
-    ListElement {
-        name: "Polly"
-        type: "Parrot"
-        age: 12
-        size: "Small"
-    }
-    ListElement {
-        name: "Penny"
-        type: "Turtle"
-        age: 4
-        size: "Small"
-    }
-    ListElement {
-        name: "Warren"
-        type: "Rabbit"
-        age: 2
-        size: "Small"
-    }
-    ListElement {
-        name: "Spot"
-        type: "Dog"
-        age: 9
-        size: "Medium"
-    }
-    ListElement {
-        name: "Schrödinger"
-        type: "Cat"
-        age: 2
-        size: "Medium"
-    }
-    ListElement {
-        name: "Joey"
-        type: "Kangaroo"
-        age: 1
-        size: "Medium"
-    }
-    ListElement {
-        name: "Kimba"
-        type: "Bunny"
-        age: 65
-        size: "Large"
-    }
-    ListElement {
-        name: "Rover"
-        type: "Dog"
-        age: 5
-        size: "Large"
-    }
-    ListElement {
-        name: "Tiny"
-        type: "Elephant"
-        age: 15
-        size: "Large"
-    }
-}
diff --git a/examples/declarative/particles/trails/content/particle.png b/examples/declarative/particles/trails/content/particle.png
deleted file mode 100644
index 5c83896d22..0000000000
--- a/examples/declarative/particles/trails/content/particle.png
+++ /dev/null
diff --git a/examples/declarative/particles/trails/list.qml b/examples/declarative/particles/trails/list.qml
deleted file mode 100644
index b64e49456b..0000000000
--- a/examples/declarative/particles/trails/list.qml
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// This example shows how to create your own highlight delegate for a ListView
-// that uses a SpringAnimation to provide custom movement when the
-// highlight bar is moved between items. + Particles.
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "content"
-
-Rectangle {
-    width: 200; height: 300
-    color: "black"
-    ParticleSystem{ id: particles }
-    ImageParticle{
-        anchors.fill: parent
-        system: particles
-        z: 10
-        source: "content/star.png"
-        color: "white"
-        colorVariation: 0.0
-        rotationSpeed: 360
-    }
-
-    // Define a delegate component.  A component will be
-    // instantiated for each visible item in the list.
-    Component {
-        id: petDelegate
-        Item {
-            id: wrapper
-            width: 200; height: 55
-            Column {
-                Text { text: 'Name: ' + name; color: "white" }
-                Text { text: 'Type: ' + type; color: "white" }
-                Text { text: 'Age: ' + age; color: "white" }
-            }
-            // indent the item if it is the current item
-            states: State {
-                name: "Current"
-                when: wrapper.ListView.isCurrentItem
-                PropertyChanges { target: wrapper; x: 20 }
-            }
-            transitions: Transition {
-                NumberAnimation { properties: "x"; duration: 200 } 
-            }
-        }
-    }
-
-    // Define a highlight with customised movement between items.
-    Component {
-        id: highlightBar
-        Rectangle {
-            width: 200; height: 50
-            color: "#333366"
-            y: listView.currentItem.y;
-            //Behavior on y { SpringAnimation { spring: 2; damping: 0.1 } }
-            Behavior on y { NumberAnimation {id: anim} }
-            Emitter{
-                anchors.fill: parent
-                system: particles;
-                enabled: anim.running
-                emitRate: 600
-                lifeSpan: 600
-                size: 16
-                endSize: 8
-                sizeVariation: 8
-            }
-        }
-    }
-
-    ListView {
-        id: listView
-        width: 200; height: parent.height
-
-        model: PetsModel {}
-        delegate: petDelegate
-        focus: true
-
-        // Set the highlight delegate. Note we must also set highlightFollowsCurrentItem
-        // to false so the highlight delegate can control how the highlight is moved.
-        highlight: highlightBar
-        highlightFollowsCurrentItem: false
-    }
-}
diff --git a/examples/declarative/particles/trails/trails.qml b/examples/declarative/particles/trails/trails.qml
deleted file mode 100644
index 1b6f9e00c7..0000000000
--- a/examples/declarative/particles/trails/trails.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Rectangle{
-    color: "black"
-    width: 360
-    height: 540
-    ParticleSystem{ id: sys }
-    ImageParticle{
-        system: sys
-        id: cp
-        source: "content/particle.png"
-        color: "#00FFFFFF"
-        colorVariation: 0.4
-    }
-    Emitter{
-    //burst on click
-        id: bursty
-        system: sys
-        enabled: false
-        emitRate: 2000
-        lifeSpan: 500
-        acceleration: AngleDirection{ angle: 90; angleVariation: 360; magnitude: 640; }
-        size: 8
-        endSize: 16
-        sizeVariation: 4
-    }
-    Emitter{
-        system: sys
-        speedFromMovement: 4.0
-        enabled: ma.pressed
-        x: ma.mouseX
-        y: ma.mouseY
-        emitRate: 400
-        lifeSpan: 2000
-        acceleration: AngleDirection{ angle: 90; angleVariation: 22; magnitude: 32; }
-        size: 8
-        endSize: 16
-        sizeVariation: 8
-    }
-    MouseArea{
-        id: ma
-        anchors.fill: parent
-        onPressed: {bursty.x = mouse.x; bursty.y = mouse.y; bursty.pulse(0.1);}//uses both for comparison
-        onReleased: {bursty.x = mouse.x; bursty.y = mouse.y; bursty.burst(200);}
-    }
-}
diff --git a/examples/declarative/plasmapatrol/content/pics/particle.png b/examples/declarative/plasmapatrol/content/pics/particle.png
deleted file mode 100644
index 5c83896d22..0000000000
--- a/examples/declarative/plasmapatrol/content/pics/particle.png
+++ /dev/null
diff --git a/examples/declarative/plasmapatrol/content/pics/star.png b/examples/declarative/plasmapatrol/content/pics/star.png
deleted file mode 100644
index 0d592cfa87..0000000000
--- a/examples/declarative/plasmapatrol/content/pics/star.png
+++ /dev/null