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:
  Fix ListView sections with QList<QObject*>
  Doc error fixes.
  Remove the -use-blur option from qtdemo
  Add label to explain how to exit QML demos
  PathView doc clarification.
  Fix Samegame

1 files changed, 4 insertions, 5 deletions

diff --git a/examples/declarative/modelviews/pathview/pathview-example.qml b/examples/declarative/modelviews/pathview/pathview-example.qml
index 59a0acb..0a3b34c 100644
--- a/examples/declarative/modelviews/pathview/pathview-example.qml
+++ b/examples/declarative/modelviews/pathview/pathview-example.qml
@@ -57,10 +57,9 @@ Rectangle {
 
     Component {
         id: appDelegate
-
         Item {
             width: 100; height: 100
-            scale: PathView.scale
+            scale: PathView.iconScale
 
             Image {
                 id: myIcon
@@ -98,11 +97,11 @@ Rectangle {
         path: Path {
             startX: 10
             startY: 50
-            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "iconScale"; value: 0.5 }
             PathQuad { x: 200; y: 150; controlX: 50; controlY: 200 }
-            PathAttribute { name: "scale"; value: 1.0 }
+            PathAttribute { name: "iconScale"; value: 1.0 }
             PathQuad { x: 390; y: 50; controlX: 350; controlY: 200 }
-            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "iconScale"; value: 0.5 }
         }
     }
 }