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

Conflicts:
	demos/declarative/flickr/content/ImageDetails.qml

1 files changed, 5 insertions, 7 deletions

diff --git a/demos/declarative/contacts/ContactField.qml b/demos/declarative/contacts/ContactField.qml
index 003e723..765dcbd 100644
--- a/demos/declarative/contacts/ContactField.qml
+++ b/demos/declarative/contacts/ContactField.qml
@@ -34,15 +34,13 @@ Item {
         State {
             name: "editingText"
             when: fieldText.state == 'editing'
-            SetProperty {
+            SetProperties {
                 target: removeButton.anchors
-                property: "rightMargin"
-                value: -35
+                rightMargin: -35
             }
-            SetProperty {
+            SetProperties {
                 target: fieldText
-                property: "width"
-                value: contactField.width
+                width: contactField.width
             }
         }
     ]
@@ -51,7 +49,7 @@ Item {
             fromState: ""
             toState: "*"
             reversible: true
-            NumericAnimation {
+            NumberAnimation {
                 properties: "width,rightMargin"
                 duration: 200
             }