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: (37 commits)
  Search for QML import libraries also in application directory
  Doc improvements
  Disable mouse-based selection in TextInput/TextEdit
  Rename qml executable to qmlviewer
  Don't crash if the target parent is destroyed.
  Introduce a threaded interpreter for QML binding bytecode
  Bug moved.
  doc
  doc
  Remove image example (covered in class docs)
  When changing Loader source, remove old item from scene immediately.
  Add missing .qmlproject files
  Fix folderlistmodel with qt namespace
  Renaming "Qml Launcher"  back to "QML Viewer"
  Rename some examples: proxyviewer -> networkaccessmanagerfactory,
  Regression fix for Loader anchors not working
  Make Qt.include() work for js files that have '.pragma library'
  doc fix
  Improve docs for Qt.quit()
  Prevent assignment of values (string, number, bool)  to signal handlers.
  ...

5 files changed, 105 insertions, 35 deletions

diff --git a/doc/src/snippets/declarative/folderlistmodel.qml b/doc/src/snippets/declarative/folderlistmodel.qml
new file mode 100644
index 0000000..e90f9fd
--- /dev/null
+++ b/doc/src/snippets/declarative/folderlistmodel.qml
@@ -0,0 +1,17 @@
+//![0]
+import Qt 4.7
+import Qt.labs.folderlistmodel 1.0
+
+ListView {
+    FolderListModel {
+        id: foldermodel
+        nameFilters: ["*.qml"]
+    }
+    Component {
+        id: filedelegate
+        Text { text: fileName }
+    }
+    model: foldermodel
+    delegate: filedelegate
+}
+//![0]
diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml
index cf345aa..1d3df97 100644
--- a/doc/src/snippets/declarative/gridview/gridview.qml
+++ b/doc/src/snippets/declarative/gridview/gridview.qml
@@ -4,7 +4,7 @@ import Qt 4.7
 Rectangle {
     width: 240; height: 180; color: "white"
     // ContactModel model is defined in dummydata/ContactModel.qml
-    // The launcher automatically loads files in dummydata/* to assist
+    // The viewer automatically loads files in dummydata/* to assist
     // development without a real data source.
 
     // Define a delegate component.  A component will be
diff --git a/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml b/doc/src/snippets/declarative/listview/ContactModel.qml
index 20687cf..b930c06 100644
--- a/doc/src/snippets/declarative/listview/dummydata/ContactModel.qml
+++ b/doc/src/snippets/declarative/listview/ContactModel.qml
@@ -1,7 +1,7 @@
+//![0]
 import Qt 4.7
 
 ListModel {
-    id: contactModel
     ListElement {
         name: "Bill Smith"
         number: "555 3264"
@@ -15,3 +15,4 @@ ListModel {
         number: "555 0473"
     }
 }
+//![0]
diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml
index 1282f8d..794b3f2 100644
--- a/doc/src/snippets/declarative/listview/highlight.qml
+++ b/doc/src/snippets/declarative/listview/highlight.qml
@@ -4,7 +4,7 @@ Rectangle {
     width: 180; height: 200; color: "white"
 
     // ContactModel model is defined in dummydata/ContactModel.qml
-    // The launcher automatically loads files in dummydata/* to assist
+    // The viewer automatically loads files in dummydata/* to assist
     // development without a real data source.
 
     // Define a delegate component.  A component will be
diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml
index 44f0540..1e9ccd9 100644
--- a/doc/src/snippets/declarative/listview/listview.qml
+++ b/doc/src/snippets/declarative/listview/listview.qml
@@ -1,49 +1,101 @@
+//![import]
 import Qt 4.7
+//![import]
 
-//! [3]
-Rectangle {
-    width: 180; height: 200; color: "white"
+Item {
+
+//![classdocs simple]
+ListView {
+    width: 180; height: 200
+
+    model: ContactModel {}
+    delegate: Text {
+        text: name + ": " + number
+    }
+}
+//![classdocs simple]
 
-    // ContactModel model is defined in dummydata/ContactModel.qml
-    // The launcher automatically loads files in dummydata/* to assist
-    // development without a real data source.
+//![classdocs advanced]
+Rectangle {
+    width: 180; height: 200
 
-    // Define a delegate component.  A component will be
-    // instantiated for each visible item in the list.
-//! [0]
     Component {
-        id: delegate
+        id: contactDelegate
         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
+        anchors.fill: parent
+        model: ContactModel {}
+        delegate: contactDelegate
+        highlight: Rectangle { color: "lightsteelblue"; radius: 5 }
         focus: true
     }
-//! [2]
 }
-//! [3]
+//![classdocs advanced]
+
+//![delayRemove]
+Component {
+    id: delegate
+    Item {
+        ListView.onRemove: SequentialAnimation {
+            PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
+            NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
+            PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
+        }
+    }
+}
+//![delayRemove]
+
+//![highlightFollowsCurrentItem]
+Component {
+    id: highlight
+    Rectangle {
+        width: 180; height: 40
+        color: "lightsteelblue"; radius: 5
+        SpringFollow on y {
+            to: list.currentItem.y
+            spring: 3
+            damping: 0.2
+        }
+    }
+}
+
+ListView {
+    id: list
+    width: 180; height: 200
+    model: ContactModel {}
+    delegate: Text { text: name }
+
+    highlight: highlight
+    highlightFollowsCurrentItem: false
+    focus: true
+}
+//![highlightFollowsCurrentItem]
+
+//![isCurrentItem]
+ListView {
+    width: 180; height: 200
+
+    Component {
+        id: contactsDelegate
+        Text {
+            id: contactInfo
+            text: name + ": " + number
+            color: contactInfo.ListView.isCurrentItem ? "red" : "black"
+        }
+    }
+
+    model: ContactModel {}
+    delegate: contactsDelegate 
+    focus: true
+}
+//![isCurrentItem]
+
+}