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

1 files changed, 2 insertions, 2 deletions

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
     }