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

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

14 files changed, 128 insertions, 212 deletions

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 145435b..2a297ef 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -120,8 +120,8 @@ Rect {
 
     transitions: [
         Transition {
-            NumericAnimation { properties: "x,y,width"; easing: "easeOutBounce"; duration: 500 }
-            NumericAnimation { properties: "opacity"; easing: "easeInOutQuad"; duration: 500 }
+            NumberAnimation { properties: "x,y,width"; easing: "easeOutBounce"; duration: 500 }
+            NumberAnimation { properties: "opacity"; easing: "easeInOutQuad"; duration: 500 }
         }
     ]
 }
diff --git a/demos/declarative/contacts/Button.qml b/demos/declarative/contacts/Button.qml
index 3b76a13..09af769 100644
--- a/demos/declarative/contacts/Button.qml
+++ b/demos/declarative/contacts/Button.qml
@@ -24,10 +24,9 @@ Item {
             State {
                 name: "pressed"
                 when: buttonMouseRegion.pressed == true
-                SetProperty {
+                SetProperties {
                     target: buttonRect
-                    property: "color"
-                    value: "green"
+                    color: "green"
                 }
             }
         ]
@@ -36,6 +35,7 @@ Item {
                 fromState: "*"
                 toState: "pressed"
                 ColorAnimation {
+                    property: "color"
                     duration: 200
                 }
             },
@@ -43,13 +43,14 @@ Item {
                 fromState: "pressed"
                 toState: "*"
                 ColorAnimation {
+                    property: "color"
                     duration: 1000
                 }
             }
         ]
     }
     opacity: Behavior {
-        NumericAnimation {
+        NumberAnimation {
             property: "opacity"
             duration: 250
         }
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
             }
diff --git a/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml
index 39e45d4..561e3c3 100644
--- a/demos/declarative/contacts/FieldText.qml
+++ b/demos/declarative/contacts/FieldText.qml
@@ -74,7 +74,7 @@ Rect {
         text: fieldText.label
         opacity: textEdit.text == '' ? 1 : 0
         opacity: Behavior {
-            NumericAnimation {
+            NumberAnimation {
                 property: "opacity"
                 duration: 250
             }
@@ -96,50 +96,41 @@ Rect {
     states: [
         State {
             name: "editing"
-            SetProperty {
+            SetProperties {
                 target: confirmIcon
-                property: "opacity"
-                value: 1
+                opacity: 1
             }
-            SetProperty {
+            SetProperties {
                 target: cancelIcon
-                property: "opacity"
-                value: 1
+                opacity: 1
             }
-            SetProperty {
+            SetProperties {
                 target: fieldText
-                property: "color"
-                value: "white"
+                color: "white"
             }
-            SetProperty {
+            SetProperties {
                 target: textEdit
-                property: "color"
-                value: "black"
+                color: "black"
             }
-            SetProperty {
+            SetProperties {
                 target: textEdit
-                property: "readOnly"
-                value: false
+                readOnly: false
             }
-            SetProperty {
+            SetProperties {
                 target: textEdit
-                property: "focus"
-                value: true
+                focus: true
             }
-            SetProperty {
+            SetProperties {
                 target: editRegion
-                property: "opacity"
-                value: 0
+                opacity: 0
             }
-            SetProperty {
+            SetProperties {
                 target: textEdit.anchors
-                property: "leftMargin"
-                value: 34
+                leftMargin: 34
             }
-            SetProperty {
+            SetProperties {
                 target: textEdit.anchors
-                property: "rightMargin"
-                value: 34
+                rightMargin: 34
             }
         }
     ]
@@ -148,11 +139,12 @@ Rect {
             fromState: ""
             toState: "*"
             reversible: true
-            NumericAnimation {
+            NumberAnimation {
                 properties: "opacity,leftMargin,rightMargin"
                 duration: 200
             }
             ColorAnimation {
+                property: "color"
                 duration: 150
             }
         }
diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml
index 8f46fcb..549c97a 100644
--- a/demos/declarative/contacts/RemoveButton.qml
+++ b/demos/declarative/contacts/RemoveButton.qml
@@ -77,7 +77,7 @@ Rect {
         opacity: 0
     }
     opacity: Behavior {
-        NumericAnimation {
+        NumberAnimation {
             property: "opacity"
             duration: 250
         }
@@ -85,30 +85,25 @@ Rect {
     states: [
         State {
             name: "opened"
-            SetProperty {
+            SetProperties {
                 target: removeButton
-                property: "width"
-                value: removeButton.expandedWidth
+                width: removeButton.expandedWidth
             }
-            SetProperty {
+            SetProperties {
                 target: text
-                property: "opacity"
-                value: 1
+                opacity: 1
             }
-            SetProperty {
+            SetProperties {
                 target: confirmIcon
-                property: "opacity"
-                value: 1
+                opacity: 1
             }
-            SetProperty {
+            SetProperties {
                 target: cancelIcon
-                property: "opacity"
-                value: 1
+                opacity: 1
             }
-            SetProperty {
+            SetProperties {
                 target: trashIcon
-                property: "opacity"
-                value: 0
+                opacity: 0
             }
         }
     ]
@@ -117,7 +112,7 @@ Rect {
             fromState: "*"
             toState: "opened"
             reversible: true
-            NumericAnimation {
+            NumberAnimation {
                 properties: "opacity,x,width"
                 duration: 200
             }
diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml
index 0ce9948..e773221 100644
--- a/demos/declarative/contacts/contacts.qml
+++ b/demos/declarative/contacts/contacts.qml
@@ -50,10 +50,9 @@ Rect {
                         State {
                             name: "currentItem"
                             when: wrapper.ListView.isCurrentItem
-                            SetProperty {
+                            SetProperties {
                                 target: label
-                                property: "color"
-                                value: "black"
+                                color: "black"
                             }
                         }
                     ]
@@ -94,36 +93,31 @@ Rect {
                 states: [
                     State {
                         name: "opened"
-                        SetProperty {
+                        SetProperties {
                             target: wrapper
-                            property: "height"
-                            value: contactListView.height
+                            height: contactListView.height
                         }
-                        SetProperty {
+                        SetProperties {
                             target: contactListView
-                            property: "yPosition"
-                            value: wrapper.y
+                            yPosition: wrapper.y
                         }
-                        SetProperty {
+                        SetProperties {
                             target: contactListView
-                            property: "locked"
-                            value: 1
+                            locked: 1
                         }
-                        SetProperty {
+                        SetProperties {
                             target: label
-                            property: "opacity"
-                            value: 0
+                            opacity: 0
                         }
-                        SetProperty {
+                        SetProperties {
                             target: Details
-                            property: "opacity"
-                            value: 1
+                            opacity: 1
                         }
                     }
                 ]
                 transitions: [
                     Transition {
-                        NumericAnimation {
+                        NumberAnimation {
                             duration: 500
                             properties: "yPosition,height,opacity"
                         }
@@ -221,7 +215,7 @@ Rect {
                 color: 'white'
                 opacity: contacts.mode == 'list' ? 1 : 0
                 opacity: Behavior {
-                    NumericAnimation {
+                    NumberAnimation {
                         property: "opacity"
                         duration: 250
                     }
@@ -277,10 +271,9 @@ Rect {
             State {
                 name: "searchHidden"
                 when: searchBar.text == '' || contacts.mode != 'list'
-                SetProperty {
+                SetProperties {
                     target: searchBarWrapper.anchors
-                    property: "bottomMargin"
-                    value: -30
+                    bottomMargin: -30
                 }
             }
         ]
@@ -288,7 +281,7 @@ Rect {
             Transition {
                 fromState: "*"
                 toState: "*"
-                NumericAnimation {
+                NumberAnimation {
                     property: "bottomMargin"
                     duration: 250
                 }
@@ -303,15 +296,13 @@ Rect {
         State {
             name: "editNewState"
             when: contacts.mode == 'new'
-            SetProperty {
+            SetProperties {
                 target: contactListView
-                property: "opacity"
-                value: 0
+                opacity: 0
             }
-            SetProperty {
+            SetProperties {
                 target: newContactWrapper
-                property: "opacity"
-                value: 1
+                opacity: 1
             }
         }
     ]
@@ -319,7 +310,7 @@ Rect {
         Transition {
             fromState: "*"
             toState: "*"
-            NumericAnimation {
+            NumberAnimation {
                 property: "opacity"
                 duration: 500
             }
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index ed60d17..c57f083 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -130,7 +130,7 @@ Flipable {
     states: [
         State {
             name: "Back"
-            SetProperty { target: Container; property: "rotation"; value: 180 }
+            SetProperties { target: Container; rotation: 180 }
         }
     ]
 
@@ -142,7 +142,7 @@ Flipable {
                     property: "smooth"
                     value: false
                 }
-                NumericAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 }
+                NumberAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 }
                 SetPropertyAction {
                     target: BigImage
                     property: "smooth"
diff --git a/demos/declarative/flickr/content/Loading.qml b/demos/declarative/flickr/content/Loading.qml
index 7488a66..0a8a51a 100644
--- a/demos/declarative/flickr/content/Loading.qml
+++ b/demos/declarative/flickr/content/Loading.qml
@@ -1,6 +1,6 @@
 Image {
     id: Loading; source: "pics/loading.png"; transformOrigin: "Center"
-    rotation: NumericAnimation {
+    rotation: NumberAnimation {
         id: "RotationAnimation"; from: 0; to: 360; running: Loading.visible == true; repeat: true; duration: 900
     }
 }
diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml
index 691bb5b..4f6fed1 100644
--- a/demos/declarative/flickr/content/MediaLineEdit.qml
+++ b/demos/declarative/flickr/content/MediaLineEdit.qml
@@ -14,10 +14,9 @@ Item {
                 target: Label
                 text: Container.label + ": "
             }
-            SetProperty {
+            SetProperties {
                 target: Label
-                property: "x"
-                binding: 10
+                x: 10
             }
             SetProperties {
                 target: Editor
@@ -41,7 +40,7 @@ Item {
     ]
     transitions: [
         Transition {
-            NumericAnimation { properties: "x,width"; duration: 500; easing: "easeInOutQuad" }
+            NumberAnimation { properties: "x,width"; duration: 500; easing: "easeInOutQuad" }
         }
     ]
 
diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/demos/declarative/flickr/content/ScrollBar.qml
index 2c4ff54..551f0ea 100644
--- a/demos/declarative/flickr/content/ScrollBar.qml
+++ b/demos/declarative/flickr/content/ScrollBar.qml
@@ -28,7 +28,7 @@ Item {
         Transition {
             fromState: "*"
             toState: "*"
-            NumericAnimation {
+            NumberAnimation {
                 target: Container
                 properties: "opacity"
                 duration: 400
diff --git a/demos/declarative/flickr/content/Star.qml b/demos/declarative/flickr/content/Star.qml
index 22fc138..437450d 100644
--- a/demos/declarative/flickr/content/Star.qml
+++ b/demos/declarative/flickr/content/Star.qml
@@ -35,7 +35,7 @@ Item {
     ]
     transitions: [
         Transition {
-            NumericAnimation {
+            NumberAnimation {
                 properties: "opacity,scale,x,y"
                 easing: "easeOutBounce"
             }
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 83448ee..edf1095 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -10,19 +10,19 @@ Item {
             id: FeedModel
             property string tags : TagsEdit.text
             source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+tags+"&" : "")+"format=rss2"
-            query: "doc($src)/rss/channel/item"
+            query: "/rss/channel/item"
             namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\";"
 
-            Role { name: "title"; query: "title/string()" }
-            Role { name: "imagePath"; query: "media:thumbnail/@url/string()" }
-            Role { name: "url"; query: "media:content/@url/string()" }
-            Role { name: "description"; query: "description/string()" }
-            Role { name: "tags"; query: "media:category/string()" }
-            Role { name: "photoWidth"; query: "media:content/@width/string()" }
-            Role { name: "photoHeight"; query: "media:content/@height/string()" }
-            Role { name: "photoType"; query: "media:content/@type/string()" }
-            Role { name: "photoAuthor"; query: "author/string()" }
-            Role { name: "photoDate"; query: "pubDate/string()" }
+            XmlRole { name: "title"; query: "title/string()" }
+            XmlRole { name: "imagePath"; query: "media:thumbnail/@url/string()" }
+            XmlRole { name: "url"; query: "media:content/@url/string()" }
+            XmlRole { name: "description"; query: "description/string()" }
+            XmlRole { name: "tags"; query: "media:category/string()" }
+            XmlRole { name: "photoWidth"; query: "media:content/@width/string()" }
+            XmlRole { name: "photoHeight"; query: "media:content/@height/string()" }
+            XmlRole { name: "photoType"; query: "media:content/@type/string()" }
+            XmlRole { name: "photoAuthor"; query: "author/string()" }
+            XmlRole { name: "photoDate"; query: "pubDate/string()" }
         },
 
         Component {
@@ -99,13 +99,13 @@ Item {
                 Transition {
                     fromState: "*"; toState: "Details"
                     ParentChangeAction { }
-                    NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                    NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
                 },
                 Transition {
                     fromState: "Details"; toState: "*"
                     SequentialAnimation {
                         ParentChangeAction { }
-                        NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
                         SetPropertyAction { filter: Wrapper; properties: "z" }
                     }
                 }
@@ -194,7 +194,7 @@ Item {
         transitions: [
             Transition {
                 fromState: "*"; toState: "*"
-                NumericAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" }
+                NumberAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" }
             }
         ]
     }
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index 79f7a32..d6d5c95 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -12,19 +12,19 @@ Item {
                     id: FeedModel
                     property string tags : TagsEdit.text
                     source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+tags+"&" : "")+"format=rss2"
-                    query: "doc($src)/rss/channel/item"
+                    query: "/rss/channel/item"
                     namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\";"
 
-                    Role { name: "title"; query: "title/string()" }
-                    Role { name: "imagePath"; query: "media:thumbnail/@url/string()" }
-                    Role { name: "url"; query: "media:content/@url/string()" }
-                    Role { name: "description"; query: "description/string()" }
-                    Role { name: "tags"; query: "media:category/string()" }
-                    Role { name: "photoWidth"; query: "media:content/@width/string()" }
-                    Role { name: "photoHeight"; query: "media:content/@height/string()" }
-                    Role { name: "photoType"; query: "media:content/@type/string()" }
-                    Role { name: "photoAuthor"; query: "author/string()" }
-                    Role { name: "photoDate"; query: "pubDate/string()" }
+                    XmlRole { name: "title"; query: "title/string()" }
+                    XmlRole { name: "imagePath"; query: "media:thumbnail/@url/string()" }
+                    XmlRole { name: "url"; query: "media:content/@url/string()" }
+                    XmlRole { name: "description"; query: "description/string()" }
+                    XmlRole { name: "tags"; query: "media:category/string()" }
+                    XmlRole { name: "photoWidth"; query: "media:content/@width/string()" }
+                    XmlRole { name: "photoHeight"; query: "media:content/@height/string()" }
+                    XmlRole { name: "photoType"; query: "media:content/@type/string()" }
+                    XmlRole { name: "photoAuthor"; query: "author/string()" }
+                    XmlRole { name: "photoDate"; query: "pubDate/string()" }
                 }
 
             delegate: Package {
@@ -48,7 +48,6 @@ Item {
                     Script {
                         function photoClicked() {
                             Background.imageDetails.photoTitle = title;
-                            Background.imageDetails.flickableArea.yPosition = 0;
                             Background.imageDetails.photoDescription = description;
                             Background.imageDetails.photoTags = tags;
                             Background.imageDetails.photoWidth = photoWidth;
@@ -100,13 +99,13 @@ Item {
                         Transition {
                             fromState: "*"; toState: "Details"
                             ParentChangeAction { }
-                            NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                            NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
                         },
                         Transition {
                             fromState: "Details"; toState: "*"
                             SequentialAnimation {
                                 ParentChangeAction { }
-                                NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                                NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
                                 SetPropertyAction { filter: Wrapper; properties: "z" }
                             }
                         }
@@ -129,15 +128,12 @@ Item {
                     states: [
                         State {
                             name: "gridView"
-                            SetProperty { target: Wrapper; property: "moveToParent"; value: GridViewPackage }
+                            SetProperties { target: Wrapper; explicit: true; property: "moveToParent"; value: GridViewPackage }
                         },
                         State {
                             name: "pathView"
-                            SetProperty { target: Wrapper; property: "scale"; value: PathViewPackage.PathView.scale }
-                            SetProperty { target: Wrapper; property: "scale"; binding: "PathViewPackage.PathView.scale" }
-                            SetProperty { target: Wrapper; property: "angle"; value: PathViewPackage.PathView.angle }
-                            SetProperty { target: Wrapper; property: "angle"; binding: "PathViewPackage.PathView.angle" }
-                            SetProperty { target: Wrapper; property: "moveToParent"; value: PathViewPackage }
+                            SetProperties { target: Wrapper; scale: PathViewPackage.PathView.scale; angle: PathViewPackage.PathView.angle; }
+                            SetProperties { target: Wrapper; explicit: true; moveToParent: PathViewPackage }
                         }
                     ]
                     transitions: [
@@ -146,14 +142,14 @@ Item {
                             SequentialAnimation {
                                 SetPropertyAction { target: Wrapper; property: "moveToParent" }
                                 ParallelAnimation {
-                                    NumericAnimation {
+                                    NumberAnimation {
                                         target: Wrapper
                                         properties: "x,y"
                                         to: 0
                                         easing: "easeOutQuad"
                                         duration: 350
                                     }
-                                    NumericAnimation { target: Wrapper; properties: "scale,angle"; duration: 350 }
+                                    NumberAnimation { target: Wrapper; properties: "scale,angle"; duration: 350 }
                                 }
                             }
                         },
@@ -163,14 +159,14 @@ Item {
                                 PauseAnimation { duration: Math.floor(index/7)*100 }
                                 SetPropertyAction { target: Wrapper; property: "moveToParent" }
                                 ParallelAnimation {
-                                    NumericAnimation {
+                                    NumberAnimation {
                                         target: Wrapper
                                         properties: "x,y"
                                         to: 0
                                         easing: "easeOutQuad"
                                         duration: 250
                                     }
-                                    NumericAnimation { target: Wrapper; properties: "scale,angle"; duration: 250 }
+                                    NumberAnimation { target: Wrapper; properties: "scale,angle"; duration: 250 }
                                 }
                             }
                         }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 889ab87..4c6a177 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -151,25 +151,17 @@ Item {
                     State {
                         name: "Normal"
                         when: WebView.progress == 1.0
-                        SetProperty {
-                            target: Header
-                            property: "progressOff"
-                            value: 1
-                        }
+                        SetProperties { target: Header; progressOff: 1 }
                     },
                     State {
                         name: "ProgressShown"
                         when: WebView.progress < 1.0
-                        SetProperty {
-                            target: Header
-                            property: "progressOff"
-                            value: 0
-                        }
+                        SetProperties { target: Header; progressOff: 0; }
                     }
                 ]
                 transitions: [
                     Transition {
-                        NumericAnimation {
+                        NumberAnimation {
                             target: Header
                             properties: "progressOff"
                             easing: "easeInOutQuad"
@@ -255,35 +247,19 @@ Item {
                     State {
                         name: "Enabled"
                         when: WebView.back.enabled==true
-                        SetProperty {
-                            target: back_e
-                            property: "opacity"
-                            value: 1
-                        }
-                        SetProperty {
-                            target: back_d
-                            property: "opacity"
-                            value: 0
-                        }
+                        SetProperties { target: back_e; opacity: 1 }
+                        SetProperties { target: back_d; opacity: 0 }
                     },
                     State {
                         name: "Disabled"
                         when: WebView.back.enabled==false
-                        SetProperty {
-                            target: back_e
-                            property: "opacity"
-                            value: 0
-                        }
-                        SetProperty {
-                            target: back_d
-                            property: "opacity"
-                            value: 1
-                        }
+                        SetProperties { target: back_e; opacity: 0 }
+                        SetProperties { target: back_d; opacity: 1 }
                     }
                 ]
                 transitions: [
                     Transition {
-                        NumericAnimation {
+                        NumberAnimation {
                             properties: "opacity"
                             easing: "easeInOutQuad"
                             duration: 300
@@ -327,35 +303,19 @@ Item {
                     State {
                         name: "Enabled"
                         when: WebView.forward.enabled==true
-                        SetProperty {
-                            target: forward_e
-                            property: "opacity"
-                            value: 1
-                        }
-                        SetProperty {
-                            target: forward_d
-                            property: "opacity"
-                            value: 0
-                        }
+                        SetProperties { target: forward_e; opacity: 1 }
+                        SetProperties { target: forward_d; opacity: 0 }
                     },
                     State {
                         name: "Disabled"
                         when: WebView.forward.enabled==false
-                        SetProperty {
-                            target: forward_e
-                            property: "opacity"
-                            value: 0
-                        }
-                        SetProperty {
-                            target: forward_d
-                            property: "opacity"
-                            value: 1
-                        }
+                        SetProperties { target: forward_e; opacity: 0 }
+                        SetProperties { target: forward_d; opacity: 1 }
                     }
                 ]
                 transitions: [
                     Transition {
-                        NumericAnimation {
+                        NumberAnimation {
                             properties: "opacity"
                             easing: "easeInOutQuad"
                             duration: 320
@@ -372,29 +332,13 @@ Item {
     states: [
         State {
             name: "Normal"
-            SetProperty {
-                target: WebView
-                property: "zoomedOut"
-                value: 0
-            }
-            SetProperty {
-                target: Flick
-                property: "xPosition"
-                value: Math.min(WebView.width-Flick.width,Math.max(0,Flick.centerX-Flick.width/2))
-            }
-            SetProperty {
-                target: Flick
-                property: "yPosition"
-                value: Math.min(WebView.height-Flick.height,Math.max(0,Flick.centerY-Flick.height/2))
-            }
+            SetProperties { target: WebView; zoomedOut: 0 }
+            SetProperties { target: Flick; explicit: true; xPosition: Math.min(WebView.width-Flick.width,Math.max(0,Flick.centerX-Flick.width/2)) }
+            SetProperties { target: Flick; explicit: true; yPosition: Math.min(WebView.height-Flick.height,Math.max(0,Flick.centerY-Flick.height/2)) }
         },
         State {
             name: "ZoomedOut"
-            SetProperty {
-                target: WebView
-                property: "zoomedOut"
-                value: 1
-            }
+            SetProperties { target: WebView; zoomedOut: 1 }
         }
     ]
     transitions: [
@@ -406,13 +350,13 @@ Item {
                     value: false
                 }
                 ParallelAnimation {
-                    NumericAnimation {
+                    NumberAnimation {
                         target: WebView
                         properties: "zoomedOut"
                         easing: "easeInOutQuad"
                         duration: 200
                     }
-                    NumericAnimation {
+                    NumberAnimation {
                         target: Flick
                         properties: "xPosition,yPosition"
                         easing: "easeInOutQuad"