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

12 files changed, 15 insertions, 12 deletions

diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml
index 5dc211e..07f71bb 100644
--- a/examples/declarative/connections/connections.qml
+++ b/examples/declarative/connections/connections.qml
@@ -1,7 +1,8 @@
 import Qt 4.6
+import "content"
 
 Rectangle {
-    id: window; color: "#343434"
+    id: window; color: "#646464"
     width: 640; height: 480
 
     function turnLeft() {
@@ -12,16 +13,16 @@ Rectangle {
     }
 
     Image {
-        id: image; source: "bg1.jpg"; anchors.centerIn: parent; transformOrigin: Item.Center
+        id: image; source: "content/bg1.jpg"; anchors.centerIn: parent; transformOrigin: Item.Center
         rotation: Behavior { NumberAnimation { easing: "easeOutCubic"; duration: 300 } }
     }
 
     Button {
-        id: leftButton; image: "rotate-left.png"
+        id: leftButton; image: "content/rotate-left.png"
         anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 10 }
     }
     Button {
-        id: rightButton; image: "rotate-right.png"
+        id: rightButton; image: "content/rotate-right.png"
         anchors { right: parent.right; bottom: parent.bottom; rightMargin: 10; bottomMargin: 10 }
     }
 
diff --git a/examples/declarative/connections/Button.qml b/examples/declarative/connections/content/Button.qml
index 1d46acc..1d46acc 100644
--- a/examples/declarative/connections/Button.qml
+++ b/examples/declarative/connections/content/Button.qml
diff --git a/examples/declarative/connections/bg1.jpg b/examples/declarative/connections/content/bg1.jpg
index dfc7cee..dfc7cee 100644
--- a/examples/declarative/connections/bg1.jpg
+++ b/examples/declarative/connections/content/bg1.jpg
diff --git a/examples/declarative/connections/rotate-left.png b/examples/declarative/connections/content/rotate-left.png
index c30387e..c30387e 100644
--- a/examples/declarative/connections/rotate-left.png
+++ b/examples/declarative/connections/content/rotate-left.png
diff --git a/examples/declarative/connections/rotate-right.png b/examples/declarative/connections/content/rotate-right.png
index 1b05674..1b05674 100644
--- a/examples/declarative/connections/rotate-right.png
+++ b/examples/declarative/connections/content/rotate-right.png
diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml
index 9bfab0e..0166b4c 100644
--- a/examples/declarative/dynamic/dynamic.qml
+++ b/examples/declarative/dynamic/dynamic.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import "qml"
 
 Item {
     id: window
@@ -71,26 +72,26 @@ Item {
                 PaletteItem{ 
                     anchors.verticalCenter: parent.verticalCenter
                     file: "Sun.qml";
-                    image: "images/sun.png"
+                    image: "../images/sun.png"
                 }
                 PaletteItem{ 
                     file: "GenericItem.qml"
-                    image: "images/moon.png"
+                    image: "../images/moon.png"
                 }
                 PaletteItem{ 
                     anchors.verticalCenter: parent.verticalCenter
                     file: "PerspectiveItem.qml"
-                    image: "images/tree_s.png"
+                    image: "../images/tree_s.png"
                 }
                 PaletteItem{ 
                     anchors.verticalCenter: parent.verticalCenter
                     file: "PerspectiveItem.qml"
-                    image: "images/rabbit_brown.png"
+                    image: "../images/rabbit_brown.png"
                 }
                 PaletteItem{ 
                     anchors.verticalCenter: parent.verticalCenter
                     file: "PerspectiveItem.qml"
-                    image: "images/rabbit_bw.png"
+                    image: "../images/rabbit_bw.png"
                 }
             }
             Text{ text: "Active Suns: " + activeSuns }
diff --git a/examples/declarative/dynamic/Button.qml b/examples/declarative/dynamic/qml/Button.qml
index 0b8b6db..2769cd8 100644
--- a/examples/declarative/dynamic/Button.qml
+++ b/examples/declarative/dynamic/qml/Button.qml
@@ -10,7 +10,7 @@ Rectangle {
     height: text.height + 10
     width: text.width + 20
     border.width: 1
-    radius: 4
+    radius: 4; smooth: true
     gradient: Gradient {
         GradientStop { position: 0.0; 
             color: if(!mr.pressed){activePalette.light;}else{activePalette.button;}
diff --git a/examples/declarative/dynamic/GenericItem.qml b/examples/declarative/dynamic/qml/GenericItem.qml
index 10e3dba..10e3dba 100644
--- a/examples/declarative/dynamic/GenericItem.qml
+++ b/examples/declarative/dynamic/qml/GenericItem.qml
diff --git a/examples/declarative/dynamic/PaletteItem.qml b/examples/declarative/dynamic/qml/PaletteItem.qml
index bb6036d..bb6036d 100644
--- a/examples/declarative/dynamic/PaletteItem.qml
+++ b/examples/declarative/dynamic/qml/PaletteItem.qml
diff --git a/examples/declarative/dynamic/PerspectiveItem.qml b/examples/declarative/dynamic/qml/PerspectiveItem.qml
index 9e09dd2..9e09dd2 100644
--- a/examples/declarative/dynamic/PerspectiveItem.qml
+++ b/examples/declarative/dynamic/qml/PerspectiveItem.qml
diff --git a/examples/declarative/dynamic/Sun.qml b/examples/declarative/dynamic/qml/Sun.qml
index a9f5d40..796a370 100644
--- a/examples/declarative/dynamic/Sun.qml
+++ b/examples/declarative/dynamic/qml/Sun.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 Image {
     id: sun
     property bool created: false
-    property string image: "images/sun.png"
+    property string image: "../images/sun.png"
     onCreatedChanged: if(created){window.activeSuns++;}else{window.activeSuns--;}
 
     source: image; 
@@ -18,7 +18,7 @@ Image {
     }
 
     states: State {
-        name: "OffScreen"; when: created && y > window.height/2;//Below the ground
+        name: "OffScreen"; when: created && y > window.height / 2;//Below the ground
         StateChangeScript { script: { sun.created = false; sun.destroy() } }
     }
 }
diff --git a/examples/declarative/dynamic/itemCreation.js b/examples/declarative/dynamic/qml/itemCreation.js
index 06e67c5..b3e8ba5 100644
--- a/examples/declarative/dynamic/itemCreation.js
+++ b/examples/declarative/dynamic/qml/itemCreation.js
@@ -32,6 +32,7 @@ function loadComponent() {
         createItem();
 
     itemComponent = createComponent(itemButton.file);
+    print(itemButton.file)
     if(itemComponent.isLoading){
         component.statusChanged.connect(finishCreation);
     }else{//Depending on the content, it can be ready or error immediately