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

5 files changed, 22 insertions, 19 deletions

diff --git a/examples/declarative/border-image/BorderImage.qml b/examples/declarative/border-image/MyBorderImage.qml
index a809d5d..f9531df 100644
--- a/examples/declarative/border-image/BorderImage.qml
+++ b/examples/declarative/border-image/MyBorderImage.qml
@@ -12,7 +12,7 @@ Item {
 
     id: Container
     width: 240; height: 240
-    Image {
+    BorderImage {
         x: Container.width / 2 - width / 2
         y: Container.height / 2 - height / 2
         width: SequentialAnimation {
@@ -26,11 +26,11 @@ Item {
             NumberAnimation { from: Container.maxHeight; to: Container.minHeight; duration: 2000; easing: "easeInOutQuad" }
         }
         source: Container.source
-        scaleGrid.horizontalTileRule: Container.horizontalMode
-        scaleGrid.verticalTileRule: Container.verticalMode
-        scaleGrid.top: Container.margin
-        scaleGrid.left: Container.margin
-        scaleGrid.bottom: Container.margin
-        scaleGrid.right: Container.margin
+        horizontalTileMode: Container.horizontalMode
+        verticalTileMode: Container.verticalMode
+        border.top: Container.margin
+        border.left: Container.margin
+        border.bottom: Container.margin
+        border.right: Container.margin
     }
 }
diff --git a/examples/declarative/border-image/animated.qml b/examples/declarative/border-image/animated.qml
index 58eb44c..ce4de16 100644
--- a/examples/declarative/border-image/animated.qml
+++ b/examples/declarative/border-image/animated.qml
@@ -5,47 +5,47 @@ Rect {
     color: "white"
     width: 1030; height: 540
 
-    BorderImage {
+    MyBorderImage {
         x: 20; y: 20; minWidth: 120; maxWidth: 240
         minHeight: 120; maxHeight: 240
         source: "colors.png"; margin: 30
     }
-    BorderImage {
+    MyBorderImage {
         x: 270; y: 20; minWidth: 120; maxWidth: 240
         minHeight: 120; maxHeight: 240
         source: "colors.png"; margin: 30
         horizontalMode: "Repeat"; verticalMode: "Repeat"
     }
-    BorderImage {
+    MyBorderImage {
         x: 520; y: 20; minWidth: 120; maxWidth: 240
         minHeight: 120; maxHeight: 240
         source: "colors.png"; margin: 30
         horizontalMode: "Stretch"; verticalMode: "Repeat"
     }
-    BorderImage {
+    MyBorderImage {
         x: 770; y: 20; minWidth: 120; maxWidth: 240
         minHeight: 120; maxHeight: 240
         source: "colors.png"; margin: 30
         horizontalMode: "Round"; verticalMode: "Round"
     }
-    BorderImage {
+    MyBorderImage {
         x: 20; y: 280; minWidth: 60; maxWidth: 200
         minHeight: 40; maxHeight: 200
         source: "bw.png"; margin: 10
     }
-    BorderImage {
+    MyBorderImage {
         x: 270; y: 280; minWidth: 60; maxWidth: 200
         minHeight: 40; maxHeight: 200
         source: "bw.png"; margin: 10
         horizontalMode: "Repeat"; verticalMode: "Repeat"
     }
-    BorderImage {
+    MyBorderImage {
         x: 520; y: 280; minWidth: 60; maxWidth: 200
         minHeight: 40; maxHeight: 200
         source: "bw.png"; margin: 10
         horizontalMode: "Stretch"; verticalMode: "Repeat"
     }
-    BorderImage {
+    MyBorderImage {
         x: 770; y: 280; minWidth: 60; maxWidth: 200
         minHeight: 40; maxHeight: 200
         source: "bw.png"; margin: 10
diff --git a/examples/declarative/border-image/borders.qml b/examples/declarative/border-image/borders.qml
index a4a329b..e8c581e 100644
--- a/examples/declarative/border-image/borders.qml
+++ b/examples/declarative/border-image/borders.qml
@@ -5,12 +5,12 @@ Rect {
     color: "white"
     width: 520; height: 280
 
-    Image {
+    BorderImage {
         x: 20; y: 20; width: 230; height: 240
         smooth: true
         source: "colors-stretch.sci"
     }
-    Image {
+    BorderImage {
         x: 270; y: 20; width: 230; height: 240
         smooth: true
         source: "colors-round.sci"
diff --git a/examples/declarative/border-image/colors.png b/examples/declarative/border-image/colors.png
index c0e137c..dfb62f3 100644
--- a/examples/declarative/border-image/colors.png
+++ b/examples/declarative/border-image/colors.png
diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml
index 6bf1c12..f2a87c8 100644
--- a/examples/declarative/fillmode/fillmode.qml
+++ b/examples/declarative/fillmode/fillmode.qml
@@ -10,8 +10,11 @@ Image {
         SetPropertyAction { value: "Stretch" }
         SetPropertyAction { target: Label; property: "text"; value: "Stretch" }
         PauseAnimation { duration: 1000 }
-        SetPropertyAction { value: "PreserveAspect" }
-        SetPropertyAction { target: Label; property: "text"; value: "PreserveAspect" }
+        SetPropertyAction { value: "PreserveAspectFit" }
+        SetPropertyAction { target: Label; property: "text"; value: "PreserveAspectFit" }
+        PauseAnimation { duration: 1000 }
+        SetPropertyAction { value: "PreserveAspectCrop" }
+        SetPropertyAction { target: Label; property: "text"; value: "PreserveAspectCrop" }
         PauseAnimation { duration: 1000 }
         SetPropertyAction { value: "Tile" }
         SetPropertyAction { target: Label; property: "text"; value: "Tile" }