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

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits)
  Fix test.
  Remove hacky fix (breaks autotest).
  Fix Behaviors for object-type properties.
  Pass symbols::prefix (Action -> QmlAction)
  Add license header.
  Fix bad merge (compile)
  Pass tst_headers::licenseCheck
  Fix ListView tests.
  Test fixes.
  More test fixes.
  Clean up QmlImageReader thread on engine destruction.
  Update test to handle QmlNetworkAccessManagerFactory
  Test fixes.
  Add a QEXPECT_FAIL for known bug.
  Fix autotest.
  Add some painting benchmarks.
  Make sure cookies are saved.
  Fix headers::licenseCheck autotest failure
  Re-add accidentally deleted file
  Test SizeItemToLoader to SizeLoaderToItem resizeMode change.
  ...

1 files changed, 49 insertions, 0 deletions

diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml
new file mode 100644
index 0000000..be0f3ad
--- /dev/null
+++ b/doc/src/snippets/declarative/listview/listview.qml
@@ -0,0 +1,49 @@
+import Qt 4.6
+
+//! [3]
+Rectangle {
+    width: 180; height: 200; color: "white"
+
+    // ContactModel model is defined in dummydata/ContactModel.qml
+    // The viewer automatically loads files in dummydata/* to assist
+    // development without a real data source.
+
+    // Define a delegate component.  A component will be
+    // instantiated for each visible item in the list.
+//! [0]
+    Component {
+        id: delegate
+        Item {
+            id: wrapper
+            width: 180; height: 40
+            Column {
+                x: 5; y: 5
+                Text { text: '<b>Name:</b> ' + name }
+                Text { text: '<b>Number:</b> ' + number }
+            }
+        }
+    }
+//! [0]
+    // Define a highlight component.  Just one of these will be instantiated
+    // by each ListView and placed behind the current item.
+//! [1]
+    Component {
+        id: highlight
+        Rectangle {
+            color: "lightsteelblue"
+            radius: 5
+        }
+    }
+//! [1]
+    // The actual list
+//! [2]
+    ListView {
+        width: parent.width; height: parent.height
+        model: ContactModel
+        delegate: delegate
+        highlight: highlight
+        focus: true
+    }
+//! [2]
+}
+//! [3]