tile/preservseAspect are now fillMode

as per API review

5 files changed, 42 insertions, 3 deletions

diff --git a/examples/declarative/aspectratio/scale_to_fit_simple.qml b/examples/declarative/aspectratio/scale_to_fit_simple.qml
index f9c0e04..5381bb4 100644
--- a/examples/declarative/aspectratio/scale_to_fit_simple.qml
+++ b/examples/declarative/aspectratio/scale_to_fit_simple.qml
@@ -13,7 +13,7 @@ Rect {
     Image {
         id: Image
         source: "pics/face.png"
-        preserveAspect: true
+        fillMode: "PreserveAspect"
         anchors.fill: parent
     }
 }
diff --git a/examples/declarative/fillmode/face.png b/examples/declarative/fillmode/face.png
new file mode 100644
index 0000000..9623b1a
--- /dev/null
+++ b/examples/declarative/fillmode/face.png
diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml
new file mode 100644
index 0000000..473f553
--- /dev/null
+++ b/examples/declarative/fillmode/fillmode.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Image {
+    width: 400
+    height: 250
+    source: "face.png"
+    fillMode: SequentialAnimation {
+        running: true
+        repeat: true
+        SetPropertyAction { value: "Stretch" }
+        SetPropertyAction { target: Label; property: "text"; value: "Stretch" }
+        PauseAnimation { duration: 1000 }
+        SetPropertyAction { value: "PreserveAspect" }
+        SetPropertyAction { target: Label; property: "text"; value: "PreserveAspect" }
+        PauseAnimation { duration: 1000 }
+        SetPropertyAction { value: "Tile" }
+        SetPropertyAction { target: Label; property: "text"; value: "Tile" }
+        PauseAnimation { duration: 1000 }
+        SetPropertyAction { value: "TileHorizontally" }
+        SetPropertyAction { target: Label; property: "text"; value: "TileHorizontally" }
+        PauseAnimation { duration: 1000 }
+        SetPropertyAction { value: "TileVertically" }
+        SetPropertyAction { target: Label; property: "text"; value: "TileVertically" }
+        PauseAnimation { duration: 1000 }
+    }
+    Text {
+        id: Label
+        font.size: 24
+        color: "blue"
+        style: "Outline"
+        styleColor: "white"
+        anchors { centeredIn: parent }
+    }
+    Rect {
+        pen.color: "black"
+        color: "transparent"
+        anchors { fill: parent; rightMargin: 1; bottomMargin: 1}
+    }
+}
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml
index e1f48ef..6b45b79 100644
--- a/examples/declarative/minehunt/minehunt.qml
+++ b/examples/declarative/minehunt/minehunt.qml
@@ -119,7 +119,7 @@ Item {
     ]
     Image {
         source: "pics/No-Ones-Laughing-3.jpg"
-        tile: true
+        fillMode: "Tile"
     }
     Description {
         text: "Use the 'minehunt' executable to run this demo!"
diff --git a/examples/declarative/snow/ImageBatch.qml b/examples/declarative/snow/ImageBatch.qml
index 77bacab..bac4328 100644
--- a/examples/declarative/snow/ImageBatch.qml
+++ b/examples/declarative/snow/ImageBatch.qml
@@ -41,7 +41,7 @@ GridView {
         transformOrigin: "Center"
         width: MyGrid.imageWidth; height: MyGrid.imageHeight;
 
-        Image { id: Image; source: url; preserveAspect: true; smooth: true; anchors.fill: parent;
+        Image { id: Image; source: url; fillMode: "PreserveAspect"; smooth: true; anchors.fill: parent;
                 opacity: (status == 0)?1:0; opacity: Behavior { NumberAnimation { properties: "opacity" } } } 
         Loading { anchors.centeredIn: parent; visible: Image.status }