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

Conflicts:
	configure
	mkspecs/common/symbian/symbian.conf
	mkspecs/features/symbian/application_icon.prf
	qmake/generators/makefile.cpp
	qmake/generators/symbian/initprojectdeploy_symbian.cpp
	qmake/generators/symbian/symmake.cpp
	tools/assistant/tools/assistant/assistant.pro

1 files changed, 36 insertions, 0 deletions

diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml
new file mode 100644
index 0000000..19a192c
--- /dev/null
+++ b/doc/src/snippets/declarative/pathview/pathattributes.qml
@@ -0,0 +1,36 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240; height: 200; color: 'white'
+//! [0]
+//! [1]
+    Component {
+        id: delegate
+        Item {
+            id: wrapper
+            width: 80; height: 80
+            scale: PathView.scale
+            opacity: PathView.opacity
+            Column {
+                Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon }
+                Text { id: name; text: name; font.pointSize: 16}
+            }
+        }
+    }
+//! [1]
+//! [2]
+    PathView {
+        anchors.fill: parent; model: MenuModel; delegate: delegate
+        path: Path {
+            startX: 120; startY: 100
+            PathAttribute { name: "scale"; value: 1.0 }
+            PathAttribute { name: "opacity"; value: 1.0 }
+            PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
+            PathAttribute { name: "scale"; value: 0.3 }
+            PathAttribute { name: "opacity"; value: 0.5 }
+            PathQuad { x: 120; y: 100; controlX: -20; controlY: 75 }
+        }
+    }
+//! [2]
+//! [0]
+}