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

8 files changed, 27 insertions, 21 deletions

diff --git a/examples/declarative/modelviews/listview/PetsModel.qml b/examples/declarative/modelviews/listview/PetsModel.qml
index 70cdcdd..b77557d 100644
--- a/examples/declarative/modelviews/listview/PetsModel.qml
+++ b/examples/declarative/modelviews/listview/PetsModel.qml
@@ -40,10 +40,7 @@
 
 import Qt 4.7
 
-// ListModel allows free form list models to be defined and populated.
-
 ListModel {
-    id: petsModel
     ListElement {
         name: "Polly"
         type: "Parrot"
diff --git a/examples/declarative/modelviews/listview/RecipesModel.qml b/examples/declarative/modelviews/listview/RecipesModel.qml
index 03ab961..e6d829f 100644
--- a/examples/declarative/modelviews/listview/RecipesModel.qml
+++ b/examples/declarative/modelviews/listview/RecipesModel.qml
@@ -41,7 +41,6 @@
 import Qt 4.7
 
 ListModel {
-    id: recipesModel
     ListElement {
         title: "Pancakes"
         picture: "content/pics/pancakes.jpg"
diff --git a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml b/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
index 7c174e3..0d5a255 100644
--- a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
+++ b/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
@@ -51,6 +51,11 @@ Image {
 
     scale: pressed ? 0.9 : 1
 
+    function release() {
+        autoRepeatClicks.stop()
+        container.pressed = false
+    }
+
     SequentialAnimation on pressed {
         id: autoRepeatClicks
         running: false
@@ -70,10 +75,8 @@ Image {
         anchors.fill: parent
 
         onPressed: autoRepeatClicks.start()
-        onReleased: { 
-            autoRepeatClicks.stop()
-            container.pressed = false
-        }
+        onReleased: container.release()
+        onCanceled: container.release()
     }
 }
 
diff --git a/examples/declarative/modelviews/listview/dynamiclist.qml b/examples/declarative/modelviews/listview/dynamiclist.qml
index 0e290f5..12c331b 100644
--- a/examples/declarative/modelviews/listview/dynamiclist.qml
+++ b/examples/declarative/modelviews/listview/dynamiclist.qml
@@ -45,7 +45,7 @@ import "content"
 
 Rectangle {
     id: container
-    width: 640; height: 480
+    width: 500; height: 400
     color: "#343434"
 
     // The model:
diff --git a/examples/declarative/modelviews/listview/expandingdelegates.qml b/examples/declarative/modelviews/listview/expandingdelegates.qml
index 94ea48f..24d6386 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates.qml
+++ b/examples/declarative/modelviews/listview/expandingdelegates.qml
@@ -138,7 +138,8 @@ Rectangle {
                     id: flick
                     width: parent.width
                     anchors { top: methodTitle.bottom; bottom: parent.bottom }
-                    contentHeight: methodText.height; clip: true
+                    contentHeight: methodText.height
+                    clip: true
 
                     Text { id: methodText; text: method; wrapMode: Text.WordWrap; width: details.width }
                 }
@@ -197,6 +198,5 @@ Rectangle {
         anchors.fill: parent
         model: RecipesModel {}
         delegate: recipeDelegate
-        clip: true
     }
 }
diff --git a/examples/declarative/modelviews/listview/highlight.qml b/examples/declarative/modelviews/listview/highlight.qml
index 5748974..9f43409 100644
--- a/examples/declarative/modelviews/listview/highlight.qml
+++ b/examples/declarative/modelviews/listview/highlight.qml
@@ -38,6 +38,10 @@
 **
 ****************************************************************************/
 
+// This example shows how to create your own highlight delegate for a ListView
+// that uses a SpringFollow animation to provide custom movement when the
+// highlight bar is moved between items.
+
 import Qt 4.7
 
 Rectangle {
diff --git a/examples/declarative/modelviews/listview/highlightranges.qml b/examples/declarative/modelviews/listview/highlightranges.qml
index 162d8b7..f0d7f75 100644
--- a/examples/declarative/modelviews/listview/highlightranges.qml
+++ b/examples/declarative/modelviews/listview/highlightranges.qml
@@ -43,31 +43,31 @@ import Qt 4.7
 Rectangle {
     width: 600; height: 300
 
-    // Show the model in three lists, with different highlight ranges.
-    // preferredHighlightBegin and preferredHighlightEnd set the
-    // range in which to attempt to maintain the highlight.
+    // This example shows the same model in three different ListView items, 
+    // with different highlight ranges. The highlight ranges are set by the 
+    // preferredHighlightBegin and preferredHighlightEnd properties in ListView.
     //
-    // The second and third ListView set their currentIndex to be the
-    // same as the first, and the first ListView is given keyboard focus.
+    // The second and third ListViews set their currentIndex to be the
+    // same as the first. The first ListView is given keyboard focus.
     //
-    // The first list does not set a highlight range, so its currentItem
+    // The first ListView does not set a highlight range, so its currentItem
     // can move freely within the visible area. If it moves outside the
     // visible area, the view is automatically scrolled to keep the current
     // item visible.
     //
-    // The second list sets a highlight range which attempts to keep the
+    // The second ListView sets a highlight range which attempts to keep the
     // current item within the the bounds of the range. However,
     // items will not scroll beyond the beginning or end of the view,
     // forcing the highlight to move outside the range at the ends.
     //
-    // The third list sets the highlightRangeMode to StrictlyEnforceRange
+    // The third ListView sets the highlightRangeMode to StrictlyEnforceRange
     // and sets a range smaller than the height of an item.  This
     // forces the current item to change when the view is flicked,
     // since the highlight is unable to move.
     //
     // Note that the first ListView sets its currentIndex to be equal to
-    // the third ListView's currentIndex.  By flicking List3 with
-    // the mouse, the current index of List1 will be changed.
+    // the third ListView's currentIndex.  By flicking the third ListView with
+    // the mouse, the current index of the first ListView will be changed.
 
     ListView {
         id: list1
diff --git a/examples/declarative/modelviews/listview/sections.qml b/examples/declarative/modelviews/listview/sections.qml
index 8c038a0..8e0a49f 100644
--- a/examples/declarative/modelviews/listview/sections.qml
+++ b/examples/declarative/modelviews/listview/sections.qml
@@ -38,6 +38,9 @@
 **
 ****************************************************************************/
 
+// This example shows how a ListView can be separated into sections using
+// the ListView.section attached property.
+
 import Qt 4.7
 
 //! [0]