Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (118 commits)
  Avoid repeated create/destroy at top list boundary with sub-pixel movement.
  Call QDeclarativeItem::geometryChanged() base implementation
  qdoc fixes.
  Avoid warnings as delegates with bindings to parent are created and destroyed.
  qdoc fixes
  TextInput echoMode doc.
  Make sure to call base class implementation.
  More cleanup
  Cleanup
  Cleanup
  Use enum for drag.axis in doc and examples.
  Add missing test file.
  Fix autotest
  Add QML_XHR_DUMP option
  Compile
  doc fixes
  Doc: more clarification of cacheBuffer
  Fix some compiler warnings.
  Another initialization fix. Unleak.
  Fix compile in namespace.
  ...

2 files changed, 5 insertions, 5 deletions

diff --git a/examples/declarative/focus/Core/ListViews.qml b/examples/declarative/focus/Core/ListViews.qml
index 089f821..32a5d4c 100644
--- a/examples/declarative/focus/Core/ListViews.qml
+++ b/examples/declarative/focus/Core/ListViews.qml
@@ -14,7 +14,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -26,7 +26,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -38,7 +38,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
diff --git a/examples/declarative/focus/focus.qml b/examples/declarative/focus/focus.qml
index 22b0e50..8c992ae 100644
--- a/examples/declarative/focus/focus.qml
+++ b/examples/declarative/focus/focus.qml
@@ -38,7 +38,7 @@ Rectangle {
         }
 
         transitions: Transition {
-            NumberAnimation { properties: "y"; duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { properties: "y"; duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -64,6 +64,6 @@ Rectangle {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x,opacity"; duration: 600; easing.type: "OutQuint" }
+        NumberAnimation { properties: "x,opacity"; duration: 600; easing.type: Easing.OutQuint }
     }
 }