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

42 files changed, 88 insertions, 88 deletions

diff --git a/examples/declarative/contacts/contacts.qml b/examples/declarative/contacts/contacts.qml
index fa50010..f9901ed 100644
--- a/examples/declarative/contacts/contacts.qml
+++ b/examples/declarative/contacts/contacts.qml
@@ -24,7 +24,7 @@ Rect {
                 }
                 Image {
                     id: portraitPic
-                    src: portrait
+                    source: portrait
                     x: 10
                     y: 10
                 }
diff --git a/examples/declarative/dial/DialLibrary/Dial.qml b/examples/declarative/dial/DialLibrary/Dial.qml
index 8336a70..fe8528d 100644
--- a/examples/declarative/dial/DialLibrary/Dial.qml
+++ b/examples/declarative/dial/DialLibrary/Dial.qml
@@ -8,14 +8,14 @@ Item {
     }
     Image {
         id: Background
-        src: "background.svg"
+        source: "background.svg"
     }
     Item {
         x: 104
         y: 102
         rotation: Needle.rotation
         Image {
-            src: "needle_shadow.svg"
+            source: "needle_shadow.svg"
             x: -104
             y: -102
         }
@@ -31,12 +31,12 @@ Item {
             source: Math.min(Math.max(-130, value*2.2 - 130), 133)
         }
         Image {
-            src: "needle.svg"
+            source: "needle.svg"
             x: -102
             y: -98
         }
     }
     Image {
-        src: "overlay.svg"
+        source: "overlay.svg"
     }
 }
diff --git a/examples/declarative/listview/content/MediaButton.qml b/examples/declarative/listview/content/MediaButton.qml
index c92305a..6c672ea 100644
--- a/examples/declarative/listview/content/MediaButton.qml
+++ b/examples/declarative/listview/content/MediaButton.qml
@@ -7,8 +7,8 @@
         <Property name="text"/>
     </properties>
 
-    <Image id="Image" src="pics/button.png"/>
-    <Image id="Pressed" src="pics/button-pressed.png" opacity="0"/>
+    <Image id="Image" source="pics/button.png"/>
+    <Image id="Pressed" source="pics/button-pressed.png" opacity="0"/>
     <MouseRegion id="MouseRegion" anchors.fill="{Image}" onClicked="Container.clicked.emit();"/>
     <Text font.bold="true" color="white" anchors.centeredIn="{Image}" text="{Container.text}"/>
     <width>{Image.width}</width>
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index 0f6324f..db8604e 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -54,7 +54,7 @@ Rect {
                     width: parent.width
                     Image {
                         id: recipePic
-                        src: picture
+                        source: picture
                         width: 48
                         height: 48
                     }
@@ -115,13 +115,13 @@ Rect {
                     Image {
                         anchors.right: flick.right
                         anchors.top: flick.top
-                        src: "content/pics/moreUp.png"
+                        source: "content/pics/moreUp.png"
                         opacity: flick.atYBeginning ? 0 : 1
                     }
                     Image {
                         anchors.right: flick.right
                         anchors.bottom: flick.bottom
-                        src: "content/pics/moreDown.png"
+                        source: "content/pics/moreDown.png"
                         opacity: flick.atYEnd ? 0 : 1
                     }
                 }
diff --git a/examples/declarative/minehunt/Explosion.qml b/examples/declarative/minehunt/Explosion.qml
index 1e4f03d..8d868bc 100644
--- a/examples/declarative/minehunt/Explosion.qml
+++ b/examples/declarative/minehunt/Explosion.qml
@@ -9,7 +9,7 @@ Item {
         height: 21
         lifeSpan: 3600000
         lifeSpanDeviation: 0
-        src: "pics/star.png"
+        source: "pics/star.png"
         count: 200
         angle: 270
         angleDeviation: 360
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml
index 20c3874..fb65fa3 100644
--- a/examples/declarative/minehunt/minehunt.qml
+++ b/examples/declarative/minehunt/minehunt.qml
@@ -6,14 +6,14 @@
     <resources>
         <Component id="tile">
             <Flipable id="flipable" width="40" height="40">
-                <transform>
-                    <AxisRotation id="axis" axis.startX="20" axis.endX="20" axis.startY="20" axis.endY="0" />
-                </transform>
+                <axis>
+                    <Axis startX="20" startY="20" endX="20" endY="0" />
+                </axis>
                 <front>
-                    <Image src="pics/front.png" width="40" height="40">
+                    <Image source="pics/front.png" width="40" height="40">
                         <Image anchors.horizontalCenter="{parent.horizontalCenter}"
                                anchors.verticalCenter="{parent.verticalCenter}"
-                                src="pics/flag.png" opacity="{modelData.hasFlag}">
+                                source="pics/flag.png" opacity="{modelData.hasFlag}">
                                 <opacity>
                                     <Behaviour>
                                         <NumericAnimation property="opacity" duration="250"/>
@@ -23,34 +23,34 @@
                     </Image>
                 </front>
                 <back>
-                    <Image src="pics/back.png" width="40" height="40">
+                    <Image source="pics/back.png" width="40" height="40">
                         <Text anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}" 
                               text="{modelData.hint}" color="white" font.bold="true" 
                               opacity="{modelData.hasMine == false &amp;&amp; modelData.hint > 0}"/>
                         <Image anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}" 
-                                src="pics/bomb.png" opacity="{modelData.hasMine}"/>
+                                source="pics/bomb.png" opacity="{modelData.hasMine}"/>
                         <Explosion anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}" explode="{modelData.hasMine==true &amp;&amp; modelData.flipped==true}"/>
                     </Image>
                 </back>
                 <states>
                     <State name="back" when="{modelData.flipped == true}">
-                        <SetProperty target="{axis}" property="angle" value="180" />
+                        <SetProperty target="{flipable}" property="rotation" value="180" />
                     </State>
                 </states>
                 <transitions>
                     <Transition>
                         <SequentialAnimation>
                             <PauseAnimation duration="{var ret = Math.abs(flipable.parent.x-field.clickx) + Math.abs(flipable.parent.y-field.clicky); if (ret > 0) {if(modelData.hasMine==true &amp;&amp; modelData.flipped==true){ret*3;}else{ret;}} else {0}}"/>
-                            <NumericAnimation easing="easeInOutQuad" properties="angle"/>
+                            <NumericAnimation easing="easeInOutQuad" properties="rotation"/>
                         </SequentialAnimation>
                     </Transition>
                 </transitions>
                 <MouseRegion anchors.fill="{parent}"
-                             onClicked="field.clickx = flipable.parent.x; field.clicky = flipable.parent.y; row = Math.floor(index/9); col = index - (Math.floor(index/9) * 9); if(mouseButton==undefined || mouseButton=='Right'){flag(row,col);}else{flip(row,col);}" />
+                             onClicked="field.clickx = flipable.parent.x; field.clicky = flipable.parent.y; row = Math.floor(index/9); col = index - (Math.floor(index/9) * 9); if(mouse.button==undefined || mouse.button==Qt.RightButton){flag(row,col);}else{flip(row,col);}" />
             </Flipable>
         </Component>
     </resources>
-    <Image src="pics/No-Ones-Laughing-3.jpg" tile="true"/>
+    <Image source="pics/No-Ones-Laughing-3.jpg" tile="true"/>
     <Description text="Use the 'minehunt' executable to run this demo!" width="300" opacity="{tiles?0:1}" anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}"/>
     <Repeater dataSource="{tiles}" x="1" y="1">
         <Component>
@@ -61,12 +61,12 @@
     </Repeater>
     <Item id="gamedata" width="370" height="100" y="380">
         <Text color="white" font.size="18" x="20" y="20">In play:</Text>
-        <Image x="100" y="20" src="pics/bomb-color.png"/>
+        <Image x="100" y="20" source="pics/bomb-color.png"/>
         <Text x="100" y="60" color="white" text="{numMines}"/>
-        <Image x="140" y="20" src="pics/flag-color.png"/>
+        <Image x="140" y="20" source="pics/flag-color.png"/>
         <Text x="140" y="60" color="white" text="{numFlags}"/>
 
-        <Image x="240" y="0" src="{if(isPlaying==true){'pics/smile.png'}else{if(hasWon==true){'pics/glee.png'}else{'pics/frown.png'}}}">
+        <Image x="240" y="0" source="{if(isPlaying==true){'pics/smile.png'}else{if(hasWon==true){'pics/glee.png'}else{'pics/frown.png'}}}">
             <MouseRegion anchors.fill="{parent}" onClicked="reset()"/>
         </Image>
     </Item>
diff --git a/examples/declarative/namespaces/lib/Chronos/Clock.qml b/examples/declarative/namespaces/lib/Chronos/Clock.qml
index 088a45c..959d193 100644
--- a/examples/declarative/namespaces/lib/Chronos/Clock.qml
+++ b/examples/declarative/namespaces/lib/Chronos/Clock.qml
@@ -1,6 +1,6 @@
 <?qtfx namespacepath:http://nokia.com/qml/Chronos=. ?>
 
-<Image id="clock" src="pics/clockface.png" xmlns:This="http://nokia.com/qml/Chronos">
+<Image id="clock" source="pics/clockface.png" xmlns:This="http://nokia.com/qml/Chronos">
     <properties>
         <Property name="hours" value="0"/>
         <Property name="minutes" value="0"/>
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index 4412d7f..42e8f25 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -7,7 +7,7 @@ Rect {
         anchors.fill: parent
         Image {
             id: Picture
-            src: "pics/niagara_falls.jpg"
+            source: "pics/niagara_falls.jpg"
         }
         viewportWidth: Picture.width
         viewportHeight: Picture.height
diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml
index f62e4b6..a3f75e8 100644
--- a/examples/declarative/slideswitch/Switch.qml
+++ b/examples/declarative/slideswitch/Switch.qml
@@ -31,7 +31,7 @@ Item {
     }
     Image {
         id: Groove
-        src: "background.svg"
+        source: "background.svg"
     }
     MouseRegion {
         anchors.fill: Groove
@@ -39,7 +39,7 @@ Item {
     }
     Image {
         id: Knob
-        src: "knob.svg"
+        source: "knob.svg"
         x: 1
         y: 2
     }
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
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index 3441648..b65f2bc 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -4,7 +4,7 @@
         <Property name="stickies" />
     </properties>
 
-    <Image x="10" y="10" src="cork.jpg" opaque="true"/>
+    <Image x="10" y="10" source="cork.jpg" opaque="true"/>
     <Text x="20" y="20" height="40" font.size="14" font.bold="true" width="370" text="{day}" style="Outline" styleColor="#dedede"/>
 
     <Repeater dataSource="{Page.stickies}">
@@ -13,13 +13,13 @@
                 <Follow source="{-Flick.xVelocity / 100}" spring="2.0" damping="0.1"/>
             </rotation>
             <Item id="Sticky" scale="0.5">
-                <Image id="StickyImage" src="sticky.png" smooth="true" y="-20" x="{8 + -width * 0.6 / 2}" scale="0.6" />
+                <Image id="StickyImage" source="sticky.png" smooth="true" y="-20" x="{8 + -width * 0.6 / 2}" scale="0.6" />
                 <TextEdit id="MyText" smooth="true" font.size="28" readOnly="false" x="-104" y="36" wrap="true" rotation="-8" text="{noteText}" width="195" height="172" />
                 <Item y="-20" x="{StickyImage.x}" width="{StickyImage.width * StickyImage.scale}" height="{StickyImage.height * StickyImage.scale}" >
                     <MouseRegion id="Mouse" onClicked="MyText.focus = true" anchors.fill="{parent}" drag.target="{StickyPage}" drag.axis="xy" drag.ymin="0" drag.ymax="500" drag.xmin="0" drag.xmax="400"/>
                 </Item>
             </Item>
-            <Image src="tack.png" x="{-width / 2}" y="{-height * 0.7 / 2}" scale="0.7" />
+            <Image source="tack.png" x="{-width / 2}" y="{-height * 0.7 / 2}" scale="0.7" />
 
             <states>
                 <State name="pressed" when="{Mouse.pressed}">
diff --git a/examples/declarative/webview/qml-in-html.qml b/examples/declarative/webview/qml-in-html.qml
index 2715788..8c1c06f 100644
--- a/examples/declarative/webview/qml-in-html.qml
+++ b/examples/declarative/webview/qml-in-html.qml
@@ -1,7 +1,7 @@
 <!-- The WebView supports QML data through the HTML OBJECT tag --> 
 <Flickable width="{250*.75}" height="240"
     viewportWidth="{Web.width*Web.scale}" viewportHeight="{Web.height*Web.scale}">
-<WebView id="Web" width="250" height="420" scale="0.75">
+<WebView id="Web" width="250" height="420" scale="0.75" settings.pluginsEnabled="true">
     <html><![CDATA[
         <html>
         <body bgcolor=white>
diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml
index cfd0a98..5e98d1b 100644
--- a/examples/declarative/xmldata/daringfireball.qml
+++ b/examples/declarative/xmldata/daringfireball.qml
@@ -1,6 +1,6 @@
 <Rect color="white" width="600" height="600">
   <resources>
-        <XmlListModel id="feedModel" src="http://daringfireball.net/index.xml"
+        <XmlListModel id="feedModel" source="http://daringfireball.net/index.xml"
                                      query="doc($src)/feed/entry">
             <namespaceDeclarations>
                 declare default element namespace 'http://www.w3.org/2005/Atom';
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index 80ace18..32a706e 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -1,6 +1,6 @@
 <Rect color="black" gradientColor="#AAAAAA" width="600" height="600">
   <resources>
-        <XmlListModel id="feedModel" src="http://rss.news.yahoo.com/rss/oceania" query="doc($src)/rss/channel/item">
+        <XmlListModel id="feedModel" source="http://rss.news.yahoo.com/rss/oceania" query="doc($src)/rss/channel/item">
             <Role name="title" query="title/string()"/>
             <Role name="link" query="link/string()"/>
             <Role name="description" query="description/string()" isCData="true"/>