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

Conflicts:
	examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml
	examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml
	examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml
	examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml
	examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml
	examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml
	examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml
	examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml
	examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml
	examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml
	examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml
	examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml
	examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml
	examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml
	examples/declarative/tutorials/contacts/3_Collections/Button.qml
	examples/declarative/tutorials/contacts/3_Collections/ContactField.qml
	examples/declarative/tutorials/contacts/3_Collections/FieldText.qml
	examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml

29 files changed, 53 insertions, 53 deletions

diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml
index cf7d2bc..247e38b 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2/RemoveButton.qml
@@ -12,7 +12,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
     }
 }
 //! [0]
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml
index 9df2864..6c6a949 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/2a/RemoveButton.qml
@@ -13,7 +13,7 @@ Rect {
             anchors.right: parent.right
             anchors.rightMargin: 4
             anchors.verticalCenter: parent.verticalCenter
-            src: "../../shared/pics/trash.png"
+            source: "../../shared/pics/trash.png"
         }
     ]
 }
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml
index 02b8145..964975f 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml
@@ -12,7 +12,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
     }
     Image {
         id: confirmIcon
@@ -21,7 +21,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
     }
     Text {
         id: text
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml
index ec768da..79aae7a 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml
@@ -26,7 +26,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -41,7 +41,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -55,7 +55,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
index b2fa0ca..6c9078a 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
@@ -23,7 +23,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -37,7 +37,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -51,7 +51,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml
index 078f62e..0218c3d 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1/ContactField.qml
@@ -22,7 +22,7 @@ Item {
         text: 123123
     }
     Image {
-        src: "../../shared/pics/phone.png"
+        source: "../../shared/pics/phone.png"
         anchors.right: fieldText.left
         anchors.rightMargin: 10
         anchors.verticalCenter: parent.verticalCenter
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
index 12329ed..3142c45 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
@@ -23,7 +23,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -37,7 +37,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -51,7 +51,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml
index 55229de..62089b8 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml
@@ -25,7 +25,7 @@ Item {
         text: 123123
     }
     Image {
-        src: "../../shared/pics/phone.png"
+        source: "../../shared/pics/phone.png"
         anchors.right: fieldText.left
         anchors.rightMargin: 10
         anchors.verticalCenter: parent.verticalCenter
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
index 12329ed..3142c45 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
@@ -23,7 +23,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -37,7 +37,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -51,7 +51,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/ContactField.qml
index a31a5e0..1366548 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1b/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/ContactField.qml
@@ -21,7 +21,7 @@ Item {
         text: 123123
     }
     Image {
-        src: "../../shared/pics/phone.png"
+        source: "../../shared/pics/phone.png"
         anchors.right: fieldText.left
         anchors.rightMargin: 10
         anchors.verticalCenter: parent.verticalCenter
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
index 30985fb..a358b21 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
@@ -25,7 +25,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../../shared/pics/trash.png"
+        source: "../../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -39,7 +39,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../../shared/pics/cancel.png"
+        source: "../../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -53,7 +53,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../../shared/pics/ok.png"
+        source: "../../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml
index df4b46f..2542c1c 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/2/ContactField.qml
@@ -24,7 +24,7 @@ Item {
         text: 123123
     }
     Image {
-        src: "../../shared/pics/phone.png"
+        source: "../../shared/pics/phone.png"
         anchors.right: fieldText.left
         anchors.rightMargin: 10
         anchors.verticalCenter: parent.verticalCenter
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
index 642a33b..45b1899 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
@@ -32,7 +32,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -46,7 +46,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -60,7 +60,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
index fa4f997..2d3d58a 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
@@ -36,7 +36,7 @@ Item {
         anchors.right: fieldText.left
         anchors.rightMargin: 5
         anchors.verticalCenter: parent.verticalCenter
-        src: contactField.icon
+        source: contactField.icon
     }
     states: [
         State {
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
index 7e4a1ce..cf654cf 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
@@ -42,7 +42,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
     }
     Image {
@@ -52,7 +52,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
     }
     TextEdit {
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
index a222734..309ee5a 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
@@ -30,7 +30,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -44,7 +44,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -58,7 +58,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
index 61de59d..0c422b7 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
@@ -32,7 +32,7 @@ Item {
         anchors.right: fieldText.left
         anchors.rightMargin: 5
         anchors.verticalCenter: parent.verticalCenter
-        src: contactField.icon
+        source: contactField.icon
     }
     states: [
         State {
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
index da5e6b9..6bb4e0a 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
@@ -45,7 +45,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
     }
     Image {
@@ -55,7 +55,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
     }
     TextEdit {
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
index bc30ee6..b57a95b 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
@@ -36,7 +36,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -50,7 +50,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -64,7 +64,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
index 80588cf..57267f8 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
@@ -15,7 +15,7 @@ Item {
         radius: 5
         Image {
             id: iconImage
-            src: button.icon
+            source: button.icon
             anchors.horizontalCenter: buttonRect.horizontalCenter
             anchors.verticalCenter: buttonRect.verticalCenter
         }
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
index 61de59d..0c422b7 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
@@ -32,7 +32,7 @@ Item {
         anchors.right: fieldText.left
         anchors.rightMargin: 5
         anchors.verticalCenter: parent.verticalCenter
-        src: contactField.icon
+        source: contactField.icon
     }
     states: [
         State {
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
index 370ca00..8ba01da 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
@@ -45,7 +45,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
     }
     Image {
@@ -55,7 +55,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
     }
     TextEdit {
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
index 7e0a2f9..0b90e48 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
@@ -34,7 +34,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/trash.png"
+        source: "../../shared/pics/trash.png"
         opacity: 1
         MouseRegion {
             anchors.fill: parent
@@ -48,7 +48,7 @@ Rect {
         anchors.right: parent.right
         anchors.rightMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/cancel.png"
+        source: "../../shared/pics/cancel.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
@@ -62,7 +62,7 @@ Rect {
         anchors.left: parent.left
         anchors.leftMargin: 4
         anchors.verticalCenter: parent.verticalCenter
-        src: "../../shared/pics/ok.png"
+        source: "../../shared/pics/ok.png"
         opacity: 0
         MouseRegion {
             anchors.fill: parent
diff --git a/examples/declarative/tutorials/contacts/Final/Button.qml b/examples/declarative/tutorials/contacts/Final/Button.qml
index 8290d35..14965b5 100644
--- a/examples/declarative/tutorials/contacts/Final/Button.qml
+++ b/examples/declarative/tutorials/contacts/Final/Button.qml
@@ -10,7 +10,7 @@
         color="lightgreen"
         radius="5">
         <Image id="iconImage"
-            src="{button.icon}"
+            source="{button.icon}"
             anchors.horizontalCenter="{buttonRect.horizontalCenter}"
             anchors.verticalCenter="{buttonRect.verticalCenter}"/>
         <MouseRegion id="buttonMouseRegion"
diff --git a/examples/declarative/tutorials/contacts/Final/ContactField.qml b/examples/declarative/tutorials/contacts/Final/ContactField.qml
index fe9329a..80ffd30 100644
--- a/examples/declarative/tutorials/contacts/Final/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/Final/ContactField.qml
@@ -21,7 +21,7 @@
     <Image
         anchors.right="{fieldText.left}" anchors.rightMargin="5"
         anchors.verticalCenter="{parent.verticalCenter}"
-        src="{contactField.icon}"/>
+        source="{contactField.icon}"/>
     <states>
         <State name="editingText" when="{fieldText.state == 'editing'}">
             <SetProperty target="{removeButton.anchors}" property="rightMargin" value="-35"/>
diff --git a/examples/declarative/tutorials/contacts/Final/FieldText.qml b/examples/declarative/tutorials/contacts/Final/FieldText.qml
index 93095be..ad7669d 100644
--- a/examples/declarative/tutorials/contacts/Final/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/Final/FieldText.qml
@@ -39,13 +39,13 @@
         width="22" height="22"
         anchors.right="{parent.right}" anchors.rightMargin="4"
         anchors.verticalCenter="{parent.verticalCenter}"
-        src="../shared/pics/cancel.png"
+        source="../shared/pics/cancel.png"
         opacity="0"/>
     <Image id="confirmIcon"
         width="22" height="22"
         anchors.left="{parent.left}" anchors.leftMargin="4"
         anchors.verticalCenter="{parent.verticalCenter}"
-        src="../shared/pics/ok.png"
+        source="../shared/pics/ok.png"
         opacity="0"/>
     <TextEdit id="textEdit"
         anchors.left="{parent.left}" anchors.leftMargin="0"
diff --git a/examples/declarative/tutorials/contacts/Final/RemoveButton.qml b/examples/declarative/tutorials/contacts/Final/RemoveButton.qml
index 493ab7a..b096bca 100644
--- a/examples/declarative/tutorials/contacts/Final/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/Final/RemoveButton.qml
@@ -28,7 +28,7 @@
         width="22" height="22"
         anchors.right="{parent.right}" anchors.rightMargin="4"
         anchors.verticalCenter="{parent.verticalCenter}"
-        src="../shared/pics/trash.png"
+        source="../shared/pics/trash.png"
         opacity="1">
         <MouseRegion
             anchors.fill="{parent}"
@@ -38,7 +38,7 @@
         width="22" height="22"
         anchors.right="{parent.right}" anchors.rightMargin="4"
         anchors.verticalCenter="{parent.verticalCenter}"
-        src="../shared/pics/cancel.png"
+        source="../shared/pics/cancel.png"
         opacity="0">
         <MouseRegion
             anchors.fill="{parent}"
@@ -48,7 +48,7 @@
         width="22" height="22"
         anchors.left="{parent.left}" anchors.leftMargin="4"
         anchors.verticalCenter="{parent.verticalCenter}"
-        src="../shared/pics/ok.png"
+        source="../shared/pics/ok.png"
         opacity="0">
         <MouseRegion
             anchors.fill="{parent}"
diff --git a/examples/declarative/tutorials/contacts/Final/SearchBar.qml b/examples/declarative/tutorials/contacts/Final/SearchBar.qml
index aea5a5d..3965e39 100644
--- a/examples/declarative/tutorials/contacts/Final/SearchBar.qml
+++ b/examples/declarative/tutorials/contacts/Final/SearchBar.qml
@@ -6,7 +6,7 @@
     <Image id="searchIcon"
         anchors.left="{parent.left}" anchors.leftMargin="5"
         anchors.verticalCenter="{parent.verticalCenter}"
-        src="../shared/pics/search.png"/>
+        source="../shared/pics/search.png"/>
     <TextEdit id="searchEdit"
         anchors.left="{searchIcon.right}" anchors.right="{parent.right}"
         anchors.leftMargin="5" anchors.rightMargin="5"
diff --git a/examples/declarative/tutorials/contacts/shared/contacts.sqlite b/examples/declarative/tutorials/contacts/shared/contacts.sqlite
index 7347adc..6918878 100644
--- a/examples/declarative/tutorials/contacts/shared/contacts.sqlite
+++ b/examples/declarative/tutorials/contacts/shared/contacts.sqlite