Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

Conflicts:
	tools/qdoc3/test/qt.qdocconf

4 files changed, 18 insertions, 13 deletions

diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 985f3da..c46159c 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -263,7 +263,7 @@ make
 //! [40]
 
 //! [41]
-cd src/s60installs
+cd src
 make sis
 //! [41]
 
diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml
index 7377cee..e92a429 100644
--- a/doc/src/snippets/declarative/gridview/gridview.qml
+++ b/doc/src/snippets/declarative/gridview/gridview.qml
@@ -108,8 +108,10 @@ Component {
     Rectangle {
         width: view.cellWidth; height: view.cellHeight
         color: "lightsteelblue"; radius: 5
-        SpringFollow on x { to: view.currentItem.x; spring: 3; damping: 0.2 }
-        SpringFollow on y { to: view.currentItem.y; spring: 3; damping: 0.2 }
+        x: view.currentItem.x
+        y: view.currentItem.y
+        Behavior on x { SpringAnimation { spring: 3; damping: 0.2 } }
+        Behavior on y { SpringAnimation { spring: 3; damping: 0.2 } }
     }
 }
 
diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml
index 0c6dfd4..cde820e 100644
--- a/doc/src/snippets/declarative/listview/listview.qml
+++ b/doc/src/snippets/declarative/listview/listview.qml
@@ -99,10 +99,12 @@ Component {
     Rectangle {
         width: 180; height: 40
         color: "lightsteelblue"; radius: 5
-        SpringFollow on y {
-            to: list.currentItem.y
-            spring: 3
-            damping: 0.2
+        y: list.currentItem.y
+        Behavior on y {
+            SpringAnimation {
+                spring: 3
+                damping: 0.2
+            }
         }
     }
 }
diff --git a/doc/src/snippets/declarative/mousearea.qml b/doc/src/snippets/declarative/mousearea.qml
index 8e7c737..fb6cba0 100644
--- a/doc/src/snippets/declarative/mousearea.qml
+++ b/doc/src/snippets/declarative/mousearea.qml
@@ -83,17 +83,18 @@ Rectangle {
     id: container
     width: 600; height: 200
 
-    Image {
-        id: pic
-        source: "pics/qt.png"
-        opacity: (600.0 - pic.x) / 600
+    Rectangle {
+        id: rect
+        width: 50; height: 50
+        color: "red"
+        opacity: (600.0 - rect.x) / 600
 
         MouseArea {
             anchors.fill: parent
-            drag.target: pic
+            drag.target: rect
             drag.axis: Drag.XAxis
             drag.minimumX: 0
-            drag.maximumX: container.width - pic.width
+            drag.maximumX: container.width - rect.width
         }
     }
 }