Updates all qml examples/demos to use the easing curve value type syntax

41 files changed, 164 insertions, 162 deletions

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 54af7ad..66705e2 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -118,7 +118,7 @@ Rectangle {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x,y,width"; easing: "easeOutBounce"; duration: 500 }
-        NumberAnimation { properties: "opacity"; easing: "easeInOutQuad"; duration: 500 }
+        NumberAnimation { properties: "x,y,width"; easing.type: "OutBounce"; duration: 500 }
+        NumberAnimation { properties: "opacity"; easing.type: "InOutQuad"; duration: 500 }
     }
 }
diff --git a/demos/declarative/flickr/common/ImageDetails.qml b/demos/declarative/flickr/common/ImageDetails.qml
index 19cad06..ab94d7a 100644
--- a/demos/declarative/flickr/common/ImageDetails.qml
+++ b/demos/declarative/flickr/common/ImageDetails.qml
@@ -149,7 +149,7 @@ Flipable {
                     property: "smooth"
                     value: false
                 }
-                NumberAnimation { easing: "easeInOutQuad"; properties: "angle"; duration: 500 }
+                NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 500 }
                 PropertyAction {
                     target: bigImage
                     property: "smooth"
diff --git a/demos/declarative/flickr/common/MediaLineEdit.qml b/demos/declarative/flickr/common/MediaLineEdit.qml
index 3dfd1f3..9559f6a 100644
--- a/demos/declarative/flickr/common/MediaLineEdit.qml
+++ b/demos/declarative/flickr/common/MediaLineEdit.qml
@@ -42,7 +42,7 @@ Item {
     ]
     transitions: [
         Transition {
-            NumberAnimation { properties: "x,width"; duration: 500; easing: "easeInOutQuad" }
+            NumberAnimation { properties: "x,width"; duration: 500; easing.type: "InOutQuad" }
         }
     ]
 
diff --git a/demos/declarative/flickr/common/Star.qml b/demos/declarative/flickr/common/Star.qml
index 8cd47b4..748a5ec 100644
--- a/demos/declarative/flickr/common/Star.qml
+++ b/demos/declarative/flickr/common/Star.qml
@@ -38,7 +38,7 @@ Item {
         Transition {
             NumberAnimation {
                 properties: "opacity,scale,x,y"
-                easing: "easeOutBounce"
+                easing.type: "OutBounce"
             }
         }
     ]
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml
index 1ca3cdc..3a86347 100644
--- a/demos/declarative/flickr/flickr-desktop.qml
+++ b/demos/declarative/flickr/flickr-desktop.qml
@@ -86,14 +86,14 @@ Item {
                     from: "*"; to: "Details"
                     SequentialAnimation {
                         ParentAction { }
-                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing.type: "InOutQuad" }
                     }
                 },
                 Transition {
                     from: "Details"; to: "*"
                     SequentialAnimation {
                         ParentAction { }
-                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing.type: "InOutQuad" }
                         PropertyAction { targets: wrapper; properties: "z" }
                     }
                 }
@@ -180,7 +180,7 @@ Item {
         transitions: [
             Transition {
                 from: "*"; to: "*"
-                NumberAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" }
+                NumberAnimation { properties: "y"; duration: 1000; easing.type: "OutBounce"; easing.amplitude: 0.5 }
             }
         ]
     }
diff --git a/demos/declarative/flickr/flickr-mobile.qml b/demos/declarative/flickr/flickr-mobile.qml
index 0a89c4f..77ccd08 100644
--- a/demos/declarative/flickr/flickr-mobile.qml
+++ b/demos/declarative/flickr/flickr-mobile.qml
@@ -38,7 +38,7 @@ Item {
             }
 
             transitions: Transition {
-                NumberAnimation { properties: "x"; duration: 500; easing: "easeInOutQuad" }
+                NumberAnimation { properties: "x"; duration: 500; easing.type: "InOutQuad" }
             }
         }
 
@@ -76,7 +76,7 @@ Item {
         }
 
         transitions: Transition {
-            NumberAnimation { properties: "x"; duration: 500; easing: "easeInOutQuad" }
+            NumberAnimation { properties: "x"; duration: 500; easing.type: "InOutQuad" }
         }
     }
 }
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 0f5b69c..5722f10 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -23,7 +23,7 @@
          Item {
              anchors.centerIn: parent
              scale: 0.0
-             scale: Behavior { NumberAnimation { easing: "easeInOutQuad"} }
+             scale: Behavior { NumberAnimation { easing.type: "InOutQuad"} }
              id: scaleMe
 
              Rectangle { height: 79; width: 79; id: blackRect;  anchors.centerIn: parent; color: "black"; smooth: true }
@@ -55,13 +55,13 @@
                  Transition {
                      from: "Show"; to: "Details"
                      ParentAction { }
-                     NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" }
+                     NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" }
                  },
                  Transition {
                      from: "Details"; to: "Show"
                      SequentialAnimation {
                          ParentAction { }
-                         NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" }
+                         NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" }
                          PropertyAction { targets: wrapper; properties: "z" }
                      }
                  }
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 1963bf5..415764e 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -117,7 +117,7 @@ Flipable {
     transitions: Transition {
         SequentialAnimation {
             PropertyAction { target: bigImage; property: "smooth"; value: false }
-            NumberAnimation { easing: "easeInOutQuad"; properties: "angle"; duration: 500 }
+            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 500 }
             PropertyAction { target: bigImage; property: "smooth"; value: !flickable.moving }
         }
     }
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index 07b9762..0a06771 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -71,6 +71,6 @@ Item {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing: "easeInOutQuad" }
+        NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
     }
 }
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 92555c2..617a6ed 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -92,7 +92,7 @@ Item {
                                 }
                             }
                             NumberAnimation {
-                                easing: "easeInOutQuad"
+                                easing.type: "InOutQuad"
                                 properties: "angle"
                             }
                             ScriptAction{
diff --git a/demos/declarative/twitter/content/HomeTitleBar.qml b/demos/declarative/twitter/content/HomeTitleBar.qml
index 8054f2e..a206c87 100644
--- a/demos/declarative/twitter/content/HomeTitleBar.qml
+++ b/demos/declarative/twitter/content/HomeTitleBar.qml
@@ -115,7 +115,7 @@ Item {
     transitions: [
         Transition {
             from: "*"; to: "*"
-            NumberAnimation { properties: "x,y,width,height"; easing: "easeInOutQuad" }
+            NumberAnimation { properties: "x,y,width,height"; easing.type: "InOutQuad" }
         }
     ]
 }
diff --git a/demos/declarative/twitter/content/MultiTitleBar.qml b/demos/declarative/twitter/content/MultiTitleBar.qml
index ef7de65..e0205b8 100644
--- a/demos/declarative/twitter/content/MultiTitleBar.qml
+++ b/demos/declarative/twitter/content/MultiTitleBar.qml
@@ -18,7 +18,7 @@ Item {
         }
     ]
     transitions: [
-        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" } }
+        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } }
     ]
 }
 
diff --git a/demos/declarative/twitter/content/TitleBar.qml b/demos/declarative/twitter/content/TitleBar.qml
index 42a6115..149aa82 100644
--- a/demos/declarative/twitter/content/TitleBar.qml
+++ b/demos/declarative/twitter/content/TitleBar.qml
@@ -72,6 +72,6 @@ Item {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing: "easeInOutQuad" }
+        NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
     }
 }
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index d2abf28..b091b03 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -89,7 +89,7 @@ Item {
             }
         ]
         transitions: [
-            Transition { NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" } }
+            Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } }
         ]
     }
 }
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 7c46d4c..b60a95f 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -104,14 +104,14 @@ Flickable {
                     property: "scale"
                     from: 1
                     to: 0 // set before calling
-                    easing: "easeLinear"
+                    easing.type: "Linear"
                     duration: 200
                 }
                 NumberAnimation {
                     id: flickVX
                     target: flickable
                     property: "viewportX"
-                    easing: "easeLinear"
+                    easing.type: "Linear"
                     duration: 200
                     from: 0 // set before calling
                     to: 0 // set before calling
@@ -120,7 +120,7 @@ Flickable {
                     id: flickVY
                     target: flickable
                     property: "viewportY"
-                    easing: "easeLinear"
+                    easing.type: "Linear"
                     duration: 200
                     from: 0 // set before calling
                     to: 0 // set before calling
diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
index e58ab0a..f905150 100644
--- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
+++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
@@ -98,7 +98,7 @@ Image {
             NumberAnimation {
                 targets: header
                 properties: "progressOff"
-                easing: "easeInOutQuad"
+                easing.type: "InOutQuad"
                 duration: 300
             }
         }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 934593c..faafd5d 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -98,7 +98,7 @@ Item {
                     Transition {
                         NumberAnimation {
                             properties: "opacity"
-                            easing: "easeInOutQuad"
+                            easing.type: "InOutQuad"
                             duration: 300
                         }
                     }
@@ -154,7 +154,7 @@ Item {
                     Transition {
                         NumberAnimation {
                             properties: "opacity"
-                            easing: "easeInOutQuad"
+                            easing.type: "InOutQuad"
                             duration: 320
                         }
                     }
diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml
index 9b5bcc6..a7ba1c5 100644
--- a/examples/declarative/animations/easing.qml
+++ b/examples/declarative/animations/easing.qml
@@ -6,47 +6,47 @@ Rectangle {
 
     ListModel {
         id: easingTypes
-        ListElement { type: "easeLinear"; ballColor: "DarkRed" }
-        ListElement { type: "easeInQuad"; ballColor: "IndianRed" }
-        ListElement { type: "easeOutQuad"; ballColor: "Salmon" }
-        ListElement { type: "easeInOutQuad"; ballColor: "Tomato" }
-        ListElement { type: "easeOutInQuad"; ballColor: "DarkOrange" }
-        ListElement { type: "easeInCubic"; ballColor: "Gold" }
-        ListElement { type: "easeOutCubic"; ballColor: "Yellow" }
-        ListElement { type: "easeInOutCubic"; ballColor: "PeachPuff" }
-        ListElement { type: "easeOutInCubic"; ballColor: "Thistle" }
-        ListElement { type: "easeInQuart"; ballColor: "Orchid" }
-        ListElement { type: "easeOutQuart"; ballColor: "Purple" }
-        ListElement { type: "easeInOutQuart"; ballColor: "SlateBlue" }
-        ListElement { type: "easeOutInQuart"; ballColor: "Chartreuse" }
-        ListElement { type: "easeInQuint"; ballColor: "LimeGreen" }
-        ListElement { type: "easeOutQuint"; ballColor: "SeaGreen" }
-        ListElement { type: "easeInOutQuint"; ballColor: "DarkGreen" }
-        ListElement { type: "easeOutInQuint"; ballColor: "Olive" }
-        ListElement { type: "easeInSine"; ballColor: "DarkSeaGreen" }
-        ListElement { type: "easeOutSine"; ballColor: "Teal" }
-        ListElement { type: "easeInOutSine"; ballColor: "Turquoise" }
-        ListElement { type: "easeOutInSine"; ballColor: "SteelBlue" }
-        ListElement { type: "easeInExpo"; ballColor: "SkyBlue" }
-        ListElement { type: "easeOutExpo"; ballColor: "RoyalBlue" }
-        ListElement { type: "easeInOutExpo"; ballColor: "MediumBlue" }
-        ListElement { type: "easeOutInExpo"; ballColor: "MidnightBlue" }
-        ListElement { type: "easeInCirc"; ballColor: "CornSilk" }
-        ListElement { type: "easeOutCirc"; ballColor: "Bisque" }
-        ListElement { type: "easeInOutCirc"; ballColor: "RosyBrown" }
-        ListElement { type: "easeOutInCirc"; ballColor: "SandyBrown" }
-        ListElement { type: "easeInElastic"; ballColor: "DarkGoldenRod" }
-        ListElement { type: "easeOutElastic"; ballColor: "Chocolate" }
-        ListElement { type: "easeInOutElastic"; ballColor: "SaddleBrown" }
-        ListElement { type: "easeOutInElastic"; ballColor: "Brown" }
-        ListElement { type: "easeInBack"; ballColor: "Maroon" }
-        ListElement { type: "easeOutBack"; ballColor: "LavenderBlush" }
-        ListElement { type: "easeInOutBack"; ballColor: "MistyRose" }
-        ListElement { type: "easeOutInBack"; ballColor: "Gainsboro" }
-        ListElement { type: "easeOutBounce"; ballColor: "Silver" }
-        ListElement { type: "easeInBounce"; ballColor: "DimGray" }
-        ListElement { type: "easeInOutBounce"; ballColor: "SlateGray" }
-        ListElement { type: "easeOutInBounce"; ballColor: "DarkSlateGray" }
+        ListElement { type: "Linear"; ballColor: "DarkRed" }
+        ListElement { type: "InQuad"; ballColor: "IndianRed" }
+        ListElement { type: "OutQuad"; ballColor: "Salmon" }
+        ListElement { type: "InOutQuad"; ballColor: "Tomato" }
+        ListElement { type: "OutInQuad"; ballColor: "DarkOrange" }
+        ListElement { type: "InCubic"; ballColor: "Gold" }
+        ListElement { type: "OutCubic"; ballColor: "Yellow" }
+        ListElement { type: "InOutCubic"; ballColor: "PeachPuff" }
+        ListElement { type: "OutInCubic"; ballColor: "Thistle" }
+        ListElement { type: "InQuart"; ballColor: "Orchid" }
+        ListElement { type: "OutQuart"; ballColor: "Purple" }
+        ListElement { type: "InOutQuart"; ballColor: "SlateBlue" }
+        ListElement { type: "OutInQuart"; ballColor: "Chartreuse" }
+        ListElement { type: "InQuint"; ballColor: "LimeGreen" }
+        ListElement { type: "OutQuint"; ballColor: "SeaGreen" }
+        ListElement { type: "InOutQuint"; ballColor: "DarkGreen" }
+        ListElement { type: "OutInQuint"; ballColor: "Olive" }
+        ListElement { type: "InSine"; ballColor: "DarkSeaGreen" }
+        ListElement { type: "OutSine"; ballColor: "Teal" }
+        ListElement { type: "InOutSine"; ballColor: "Turquoise" }
+        ListElement { type: "OutInSine"; ballColor: "SteelBlue" }
+        ListElement { type: "InExpo"; ballColor: "SkyBlue" }
+        ListElement { type: "OutExpo"; ballColor: "RoyalBlue" }
+        ListElement { type: "InOutExpo"; ballColor: "MediumBlue" }
+        ListElement { type: "OutInExpo"; ballColor: "MidnightBlue" }
+        ListElement { type: "InCirc"; ballColor: "CornSilk" }
+        ListElement { type: "OutCirc"; ballColor: "Bisque" }
+        ListElement { type: "InOutCirc"; ballColor: "RosyBrown" }
+        ListElement { type: "OutInCirc"; ballColor: "SandyBrown" }
+        ListElement { type: "InElastic"; ballColor: "DarkGoldenRod" }
+        ListElement { type: "OutElastic"; ballColor: "Chocolate" }
+        ListElement { type: "InOutElastic"; ballColor: "SaddleBrown" }
+        ListElement { type: "OutInElastic"; ballColor: "Brown" }
+        ListElement { type: "InBack"; ballColor: "Maroon" }
+        ListElement { type: "OutBack"; ballColor: "LavenderBlush" }
+        ListElement { type: "InOutBack"; ballColor: "MistyRose" }
+        ListElement { type: "OutInBack"; ballColor: "Gainsboro" }
+        ListElement { type: "OutBounce"; ballColor: "Silver" }
+        ListElement { type: "InBounce"; ballColor: "DimGray" }
+        ListElement { type: "InOutBounce"; ballColor: "SlateGray" }
+        ListElement { type: "OutInBounce"; ballColor: "DarkSlateGray" }
     }
 
     Component {
@@ -80,8 +80,8 @@ Rectangle {
 
                 transitions: Transition {
                     ParallelAnimation {
-                        NumberAnimation { properties: "x"; easing: type; duration: 1000 }
-                        ColorAnimation { properties: "color"; easing: type; duration: 1000 }
+                        NumberAnimation { properties: "x"; easing.type: type; duration: 1000 }
+                        ColorAnimation { properties: "color"; easing.type: type; duration: 1000 }
                     }
                 }
             }
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml
index 9f76ee5..537ee26 100644
--- a/examples/declarative/animations/property-animation.qml
+++ b/examples/declarative/animations/property-animation.qml
@@ -45,16 +45,16 @@ Item {
         y: SequentialAnimation {
             repeat: true
 
-            // Move from minHeight to maxHeight in 300ms, using the easeOutExpo easing function
+            // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
                 from: smiley.minHeight; to: smiley.maxHeight
-                easing: "easeOutExpo"; duration: 300
+                easing.type: "OutExpo"; duration: 300
             }
             
-            // Then move back to minHeight in 1 second, using the easeOutBounce easing function
+            // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-                easing: "easeOutBounce"; duration: 1000
+                easing.type: "OutBounce"; duration: 1000
             }
 
             // Then pause for 500ms
diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml
index fc3f4bf..8fffd59 100644
--- a/examples/declarative/behaviours/test.qml
+++ b/examples/declarative/behaviours/test.qml
@@ -64,7 +64,8 @@ Rectangle {
                         property: "y"
                         from: 0
                         to: 10
-                        easing: "easeOutBounce(amplitude:30)"
+                        easing.type: "OutBounce"
+                        easing.amplitude: 30
                         duration: 250
                     }
                     NumberAnimation {
@@ -72,7 +73,8 @@ Rectangle {
                         property: "y"
                         from: 10
                         to: 0
-                        easing: "easeOutBounce(amplitude:30)"
+                        easing.type: "OutBounce"
+                        easing.amplitude: 30
                         duration: 250
                     }
                 }
diff --git a/examples/declarative/border-image/content/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml
index a57acc7..ca886e9 100644
--- a/examples/declarative/border-image/content/MyBorderImage.qml
+++ b/examples/declarative/border-image/content/MyBorderImage.qml
@@ -19,14 +19,14 @@ Item {
 
         width: SequentialAnimation {
             repeat: true
-            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing: "easeInOutQuad"}
-            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing: "easeInOutQuad" }
+            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
         }
 
         height: SequentialAnimation {
             repeat: true
-            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing: "easeInOutQuad"}
-            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing: "easeInOutQuad" }
+            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
         }
 
         border.top: container.margin
diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml
index 07f71bb..ef2cb54 100644
--- a/examples/declarative/connections/connections.qml
+++ b/examples/declarative/connections/connections.qml
@@ -14,7 +14,7 @@ Rectangle {
 
     Image {
         id: image; source: "content/bg1.jpg"; anchors.centerIn: parent; transformOrigin: Item.Center
-        rotation: Behavior { NumberAnimation { easing: "easeOutCubic"; duration: 300 } }
+        rotation: Behavior { NumberAnimation { easing.type: "OutCubic"; duration: 300 } }
     }
 
     Button {
diff --git a/examples/declarative/fonts/hello.qml b/examples/declarative/fonts/hello.qml
index c682477..fcc9580 100644
--- a/examples/declarative/fonts/hello.qml
+++ b/examples/declarative/fonts/hello.qml
@@ -11,7 +11,7 @@ Rectangle {
 
             font.letterSpacing: SequentialAnimation {
                 repeat: true;
-                NumberAnimation { from: 100; to: 300; easing: "easeInQuad"; duration: 3000 }
+                NumberAnimation { from: 100; to: 300; easing.type: "InQuad"; duration: 3000 }
                 ScriptAction { script: {
                     container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
                     container.x = (screen.width / 4) + (Math.random() * screen.width / 2)
diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
index 0bdb9fc..7cbf68a 100644
--- a/examples/declarative/layouts/Button.qml
+++ b/examples/declarative/layouts/Button.qml
@@ -17,6 +17,6 @@ Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.wid
 
     transitions:
         Transition{
-            NumberAnimation { properties:"x,left"; easing:"easeInOutQuad"; duration:200 }
+            NumberAnimation { properties:"x,left"; easing.type:"InOutQuad"; duration:200 }
         }
 }
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
index fefd964..7146702 100644
--- a/examples/declarative/layouts/positioners.qml
+++ b/examples/declarative/layouts/positioners.qml
@@ -11,12 +11,12 @@ Rectangle {
         y: 0
         move: Transition {
             NumberAnimation {
-                properties: "y"; easing: "easeOutBounce"
+                properties: "y"; easing.type: "OutBounce"
             }
         }
         add: Transition {
             NumberAnimation {
-                properties: "y"; easing: "easeOutQuad"
+                properties: "y"; easing.type: "OutQuad"
             }
         }
         Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
@@ -35,12 +35,12 @@ Rectangle {
         y: 300 
         move: Transition {
             NumberAnimation {
-                properties: "x"; easing: "easeOutBounce"
+                properties: "x"; easing.type: "OutBounce"
             }
         }
         add: Transition {
             NumberAnimation {
-                properties: "x"; easing: "easeOutQuad"
+                properties: "x"; easing.type: "OutQuad"
             }
         }
         Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
@@ -101,13 +101,13 @@ Rectangle {
 
         move: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                properties: "x,y"; easing.type: "OutBounce"
             }
         }
 
         add: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                properties: "x,y"; easing.type: "OutBounce"
             }
         }
 
@@ -136,13 +136,13 @@ Rectangle {
 
         move: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                properties: "x,y"; easing.type: "OutBounce"
             }
         }
 
         add: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                properties: "x,y"; easing.type: "OutBounce"
             }
         }
         Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
index fc5b4fe..81eadda 100644
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ b/examples/declarative/parallax/qml/Smiley.qml
@@ -27,16 +27,16 @@ Item {
         y: SequentialAnimation {
             repeat: true
 
-            // Move from minHeight to maxHeight in 300ms, using the easeOutExpo easing function
+            // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
                 from: smiley.minHeight; to: smiley.maxHeight
-                easing: "easeOutExpo"; duration: 300
+                easing.type: "OutExpo"; duration: 300
             }
             
-            // Then move back to minHeight in 1 second, using the easeOutBounce easing function
+            // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-                easing: "easeOutBounce"; duration: 1000
+                easing.type: "OutBounce"; duration: 1000
             }
 
             // Then pause for 500ms
diff --git a/examples/declarative/slideswitch/content/Switch.qml b/examples/declarative/slideswitch/content/Switch.qml
index 930f471..758aee6 100644
--- a/examples/declarative/slideswitch/content/Switch.qml
+++ b/examples/declarative/slideswitch/content/Switch.qml
@@ -66,7 +66,7 @@ Item {
 
 //![7]
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing: "easeInOutQuad"; duration: 200 }
+        NumberAnimation { properties: "x"; easing.type: "InOutQuad"; duration: 200 }
     }
 //![7]
 }
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index 48d5f60..8ad61ad 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -51,16 +51,16 @@ Rectangle {
     // transitions define how the properties change.
     transitions: [
         // When transitioning to 'Position1' move x,y over a duration of 1 second,
-        // with easeOutBounce easing function.
+        // with OutBounce easing function.
         Transition {
             from: "*"; to: "Position1"
-            NumberAnimation { properties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce"; duration: 1000 }
         },
         // When transitioning to 'Position2' move x,y over a duration of 2 seconds,
-        // with easeInOutQuad easing function.
+        // with InOutQuad easing function.
         Transition {
             from: "*"; to: "Position2"
-            NumberAnimation { properties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
+            NumberAnimation { properties: "x,y"; easing.type: "InOutQuad"; duration: 2000 }
         },
         // For any other state changes move x,y linearly over duration of 200ms.
         Transition {
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 9eaa009..b8a4f77 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -28,7 +28,7 @@ Rectangle {
         transitions: Transition {
             from: ""; to: "down"; reversible: true
             ParallelAnimation {
-                NumberAnimation { properties: "y,rotation"; duration: 500; easing: "easeInOutQuad" }
+                NumberAnimation { properties: "y,rotation"; duration: 500; easing.type: "InOutQuad" }
                 ColorAnimation { duration: 500 }
             }
         }
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index b80e29c..f7c269c 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -61,7 +61,7 @@ Rectangle {
                 transitions: Transition {
                     from: "*"; to: "Details"; reversible: true
                     SequentialAnimation {
-                        NumberAnimation { duration: 200; properties: "height"; easing: "easeOutQuad" }
+                        NumberAnimation { duration: 200; properties: "height"; easing.type: "OutQuad" }
                         NumberAnimation { duration: 200; properties: "opacity" }
                     }
                 }
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
index 99b3db6..1c1b3f8 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
+++ b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
@@ -88,7 +88,7 @@ Rectangle {
                     ScriptAction { script: console.log("Fix PropertyAction with attached properties") }
 /*
                     PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
-                    NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing: "easeInOutQuad" }
+                    NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
                     PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
 */
                 }
diff --git a/tests/auto/declarative/visual/Package_Views/packageviews.qml b/tests/auto/declarative/visual/Package_Views/packageviews.qml
index b577e45..cf3f9f7 100644
--- a/tests/auto/declarative/visual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/visual/Package_Views/packageviews.qml
@@ -64,7 +64,7 @@ Rectangle {
                         from: "*"; to: "*"
                         SequentialAnimation {
                             ParentAction{}
-                            NumberAnimation { properties: "x,y,width"; easing: "easeInOutQuad" }
+                            NumberAnimation { properties: "x,y,width"; easing.type: "InOutQuad" }
                         }
                     }
                 ]
diff --git a/tests/auto/declarative/visual/animation/easing/easing.qml b/tests/auto/declarative/visual/animation/easing/easing.qml
index 9c814eb..4248d88 100644
--- a/tests/auto/declarative/visual/animation/easing/easing.qml
+++ b/tests/auto/declarative/visual/animation/easing/easing.qml
@@ -9,127 +9,127 @@ Rectangle {
         ListModel {
             id: easingtypes
             ListElement {
-                type: "easeLinear"
+                type: "Linear"
             }
             ListElement {
-                type: "easeInQuad"
+                type: "InQuad"
             }
             ListElement {
-                type: "easeOutQuad"
+                type: "OutQuad"
             }
             ListElement {
-                type: "easeInOutQuad"
+                type: "InOutQuad"
             }
             ListElement {
-                type: "easeOutInQuad"
+                type: "OutInQuad"
             }
             ListElement {
-                type: "easeInCubic"
+                type: "InCubic"
             }
             ListElement {
-                type: "easeOutCubic"
+                type: "OutCubic"
             }
             ListElement {
-                type: "easeInOutCubic"
+                type: "InOutCubic"
             }
             ListElement {
-                type: "easeOutInCubic"
+                type: "OutInCubic"
             }
             ListElement {
-                type: "easeInQuart"
+                type: "InQuart"
             }
             ListElement {
-                type: "easeOutQuart"
+                type: "OutQuart"
             }
             ListElement {
-                type: "easeInOutQuart"
+                type: "InOutQuart"
             }
             ListElement {
-                type: "easeOutInQuart"
+                type: "OutInQuart"
             }
             ListElement {
-                type: "easeInQuint"
+                type: "InQuint"
             }
             ListElement {
-                type: "easeOutQuint"
+                type: "OutQuint"
             }
             ListElement {
-                type: "easeInOutQuint"
+                type: "InOutQuint"
             }
             ListElement {
-                type: "easeOutInQuint"
+                type: "OutInQuint"
             }
             ListElement {
-                type: "easeInSine"
+                type: "InSine"
             }
             ListElement {
-                type: "easeOutSine"
+                type: "OutSine"
             }
             ListElement {
-                type: "easeInOutSine"
+                type: "InOutSine"
             }
             ListElement {
-                type: "easeOutInSine"
+                type: "OutInSine"
             }
             ListElement {
-                type: "easeInExpo"
+                type: "InExpo"
             }
             ListElement {
-                type: "easeOutExpo"
+                type: "OutExpo"
             }
             ListElement {
-                type: "easeInOutExpo"
+                type: "InOutExpo"
             }
             ListElement {
-                type: "easeOutInExpo"
+                type: "OutInExpo"
             }
             ListElement {
-                type: "easeInCirc"
+                type: "InCirc"
             }
             ListElement {
-                type: "easeOutCirc"
+                type: "OutCirc"
             }
             ListElement {
-                type: "easeInOutCirc"
+                type: "InOutCirc"
             }
             ListElement {
-                type: "easeOutInCirc"
+                type: "OutInCirc"
             }
             ListElement {
-                type: "easeInElastic"
+                type: "InElastic"
             }
             ListElement {
-                type: "easeOutElastic"
+                type: "OutElastic"
             }
             ListElement {
-                type: "easeInOutElastic"
+                type: "InOutElastic"
             }
             ListElement {
-                type: "easeOutInElastic"
+                type: "OutInElastic"
             }
             ListElement {
-                type: "easeInBack"
+                type: "InBack"
             }
             ListElement {
-                type: "easeOutBack"
+                type: "OutBack"
             }
             ListElement {
-                type: "easeInOutBack"
+                type: "InOutBack"
             }
             ListElement {
-                type: "easeOutInBack"
+                type: "OutInBack"
             }
             ListElement {
-                type: "easeOutBounce"
+                type: "OutBounce"
             }
             ListElement {
-                type: "easeInBounce"
+                type: "InBounce"
             }
             ListElement {
-                type: "easeInOutBounce"
+                type: "InOutBounce"
             }
             ListElement {
-                type: "easeOutInBounce"
+                type: "OutInBounce"
             }
         }
     ]
@@ -177,7 +177,7 @@ Rectangle {
                             reversible: true
                             NumberAnimation {
                                 properties: "x"
-                                easing: type
+                                easing.type: type
                                 duration: 1000
                             }
                         }
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
index f2e065d..24ca76b 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
+++ b/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
@@ -14,11 +14,11 @@ Rectangle {
             repeat: true
             NumberAnimation {
                 to: 0; duration: 500
-                easing: "easeInOutQuad"
+                easing.type: "InOutQuad"
             }
             NumberAnimation {
                 to: 200-img.height
-                easing: "easeOutBounce"
+                easing.type: "OutBounce"
                 duration: 2000
             }
             PauseAnimation {
diff --git a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
index 593f495..e18e770 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
+++ b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
@@ -28,7 +28,7 @@ Rectangle {
         SequentialAnimation {
             ColorAnimation {}
             PropertyAction { properties: "x" }
-            NumberAnimation { properties: "y"; easing: "InOutQuad" }
+            NumberAnimation { properties: "y"; easing.type: "InOutQuad" }
         }
     }
 }
diff --git a/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml b/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
index 30d587a..ef4ed76 100644
--- a/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
+++ b/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
@@ -27,9 +27,9 @@ Rectangle {
 
     transitions: Transition {
         SequentialAnimation {
-            NumberAnimation { properties: "x"; easing: "InOutQuad" }
+            NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
             ScriptAction { stateChangeScriptName: "setColor" }
-            NumberAnimation { properties: "y"; easing: "InOutQuad" }
+            NumberAnimation { properties: "y"; easing.type: "InOutQuad" }
         }
     }
 }
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
index eb1ec00..e268ce7 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
+++ b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
@@ -20,14 +20,14 @@ Item {
 
         width: SequentialAnimation {
             repeat: true
-            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing: "easeInOutQuad"}
-            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing: "easeInOutQuad" }
+            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
         }
 
         height: SequentialAnimation {
             repeat: true
-            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing: "easeInOutQuad"}
-            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing: "easeInOutQuad" }
+            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
         }
 
         border.top: container.margin
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml b/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
index c33a319..a27aa6e 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
+++ b/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
@@ -36,7 +36,7 @@ Rectangle {
         }
 
         transitions: Transition {
-            NumberAnimation { easing: "easeInOutQuad"; properties: "angle"; duration: 3000 }
+            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 3000 }
         }
     }
 
@@ -64,7 +64,7 @@ Rectangle {
         }
 
         transitions: Transition {
-            NumberAnimation { easing: "easeInOutQuad"; properties: "angle"; duration: 3000 }
+            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 3000 }
         }
     }
 
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
index e0c5db4..176a5b8 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
@@ -11,8 +11,8 @@ import Qt 4.6
                     Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
                     opacity: 1
                     opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true;
-                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing: "easeInQuad"}
-                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing: "easeOutQuad"}
+                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
+                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
                              }
                 }
                 width: 1;
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
index 0038664..6a4e7fa 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
@@ -11,8 +11,8 @@ import Qt 4.6
                     Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
                     opacity: 1
                     opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true;
-                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing: "easeInQuad"}
-                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing: "easeOutQuad"}
+                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
+                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
                              }
                 }
                 width: 1;
diff --git a/tests/auto/declarative/visual/qmlspringfollow/follow.qml b/tests/auto/declarative/visual/qmlspringfollow/follow.qml
index a85a778..62503e4 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/follow.qml
+++ b/tests/auto/declarative/visual/qmlspringfollow/follow.qml
@@ -11,11 +11,11 @@ Rectangle {
             repeat: true
             NumberAnimation {
                 to: 20; duration: 500
-                easing: "easeInOutQuad"
+                easing.type: "InOutQuad"
             }
             NumberAnimation {
                 to: 200; duration: 2000
-                easing: "easeOutBounce"
+                easing.type: "OutBounce"
             }
             PauseAnimation { duration: 1000 }
         }