Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse

Conflicts:
	configure

1 files changed, 6 insertions, 6 deletions

diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml
index 8d424a8..4daee63 100644
--- a/doc/src/snippets/declarative/pathview/pathattributes.qml
+++ b/doc/src/snippets/declarative/pathview/pathattributes.qml
@@ -49,8 +49,8 @@ Rectangle {
         id: delegate
         Item {
             width: 80; height: 80
-            scale: PathView.scale
-            opacity: PathView.opacity
+            scale: PathView.iconScale
+            opacity: PathView.iconOpacity
             Column {
                 Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon }
                 Text { text: name; font.pointSize: 16}
@@ -66,11 +66,11 @@ Rectangle {
         delegate: delegate
         path: Path {
             startX: 120; startY: 100
-            PathAttribute { name: "scale"; value: 1.0 }
-            PathAttribute { name: "opacity"; value: 1.0 }
+            PathAttribute { name: "iconScale"; value: 1.0 }
+            PathAttribute { name: "iconOpacity"; value: 1.0 }
             PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
-            PathAttribute { name: "scale"; value: 0.3 }
-            PathAttribute { name: "opacity"; value: 0.5 }
+            PathAttribute { name: "iconScale"; value: 0.3 }
+            PathAttribute { name: "iconOpacity"; value: 0.5 }
             PathQuad { x: 120; y: 100; controlX: -20; controlY: 75 }
         }
     }