Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

Conflicts:
	src/declarative/util/qmlanimation.cpp
	src/declarative/util/qmlxmllistmodel.cpp

18 files changed, 27 insertions, 29 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/main.cpp b/demos/declarative/minehunt/main.cpp
index 9c225af..0b2d818 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -166,13 +166,11 @@ MyWidget::MyWidget(int width, int height, QWidget *parent, Qt::WindowFlags flags
     canvas->setFixedSize(width, height);
     vbox->addWidget(canvas);
 
-    canvas->setSource(QUrl::fromLocalFile(fileName));
-
     QmlContext *ctxt = canvas->rootContext();
     ctxt->addDefaultObject(this);
     ctxt->setContextProperty("tiles", QVariant::fromValue<QList<Tile*>*>(&_tiles));//QTBUG-5675
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(fileName));
 }
 
 MyWidget::~MyWidget()
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
                         }
                     }