Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	demos/declarative/samegame/content/BoomBlock.qml

3 files changed, 8 insertions, 5 deletions

diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index edf1095..7f45b1c 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -120,7 +120,7 @@ Item {
     
         anchors.fill: parent
 
-        Image { source: "content/pics/background.png"; opaque: true; anchors.fill: parent }
+        Image { source: "content/pics/background.png"; anchors.fill: parent }
 
         Loading { anchors.centeredIn: parent; visible: FeedModel.status != 0 }
 
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index d6d5c95..95bca38 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -180,7 +180,7 @@ Item {
         id: Background
         property var imageDetails: ImageDetails
 
-        Image { source: "content/pics/background.png"; opaque: true }
+        Image { source: "content/pics/background.png" }
 
         GridView {
             id: PhotoGridView; model: MyVisualModel.parts.gridView
diff --git a/demos/declarative/samegame/content/BoomBlock.qml b/demos/declarative/samegame/content/BoomBlock.qml
index 5e5cf18..542e7bc 100644
--- a/demos/declarative/samegame/content/BoomBlock.qml
+++ b/demos/declarative/samegame/content/BoomBlock.qml
@@ -5,8 +5,8 @@ Item { id:block
     property int targetX: 0
     property int targetY: 0
 
-    x: Follow { enabled: spawned; source: targetX; spring: 1.2; damping: 0.1 }
-    y: Follow { source: targetY; spring: 1.2; damping: 0.1 }
+    x: Follow { enabled: spawned; source: targetX; spring: 2; damping: 0.2 }
+    y: Follow { source: targetY; spring: 2; damping: 0.2 }
 
     Image { id: img
         source: {
@@ -22,9 +22,10 @@ Item { id:block
         opacity: Behavior { NumberAnimation { properties:"opacity"; duration: 200 } }
         anchors.fill: parent
     }
+
     Particles { id: particles
         width:1; height:1; anchors.centeredIn: parent; opacity: 0
-        lifeSpan: 1000000000; count:0; streamIn: false
+        lifeSpan: 700; lifeSpanDeviation: 600; count:0; streamIn: false
         angle: 0; angleDeviation: 360; velocity: 100; velocityDeviation:30
         source: {
             if(type == 0){
@@ -36,6 +37,7 @@ Item { id:block
             }
         }
     }
+
     states: [
 
         State{ name: "AliveState"; when: spawned == true && dying == false
@@ -44,6 +46,7 @@ Item { id:block
         State{ name: "DeathState"; when: dying == true
             SetProperties { target: particles; count: 50 }
             SetProperties { target: particles; opacity: 1 }
+            SetProperties { target: particles; emitting: false } // i.e. emit only once
             SetProperties { target: img; opacity: 0 }
         }
     ]