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

3 files changed, 79 insertions, 2 deletions

diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
index 15f2f11..f6564f7 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
@@ -55,16 +55,22 @@ Rectangle {
             width: view.width; height: view.height
             color: "#FFFEF0"
             Text { text: "Page 1"; font.bold: true; anchors.centerIn: parent }
+
+            Component.onDestruction: print("destroyed 1")
         }
         Rectangle {
             width: view.width; height: view.height
             color: "#F0FFF7"
             Text { text: "Page 2"; font.bold: true; anchors.centerIn: parent }
+
+            Component.onDestruction: print("destroyed 2")
         }
         Rectangle {
             width: view.width; height: view.height
             color: "#F4F0FF"
             Text { text: "Page 3"; font.bold: true; anchors.centerIn: parent }
+
+            Component.onDestruction: print("destroyed 3")
         }
     }
 
@@ -76,6 +82,7 @@ Rectangle {
         highlightRangeMode: ListView.StrictlyEnforceRange
         orientation: ListView.Horizontal
         snapMode: ListView.SnapOneItem; flickDeceleration: 2000
+        cacheBuffer: 200
     }
 
     Rectangle {
diff --git a/examples/declarative/positioners/mirroring-positioners.qml b/examples/declarative/positioners/mirroring-positioners.qml
new file mode 100644
index 0000000..0db95dd
--- /dev/null
+++ b/examples/declarative/positioners/mirroring-positioners.qml
@@ -0,0 +1,70 @@
+import QtQuick 1.0
+
+Rectangle {
+    width: column.width+10
+    height: column.height+10
+    property bool arabic: false
+    Column {
+        id: column
+        spacing: 10
+        anchors.centerIn: parent
+        Text {
+            text: "Row"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+        Row {
+            flow: arabic ? Row.RightToLeft : Row.LeftToRight
+            spacing: 10
+            Repeater {
+                model: 4
+                Loader {
+                    property int value: index
+                    sourceComponent: delegate
+                }
+            }
+        }
+        Text {
+            text: "Grid"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+        Grid {
+            flow: arabic ? Grid.RightToLeft : Grid.LeftToRight
+            spacing: 10; columns: 4
+            Repeater {
+                model: 11
+                Loader {
+                    property int value: index
+                    sourceComponent: delegate
+                }
+            }
+        }
+        Rectangle {
+            height: 50; width: parent.width
+            color: mouseArea.pressed ? "black" : "gray"
+            Text {
+                text: arabic ? "RTL" : "LTR"
+                color: "white"
+                font.pixelSize: 20
+                anchors.centerIn: parent
+            }
+            MouseArea {
+                id: mouseArea
+                onClicked: arabic = !arabic
+                anchors.fill: parent
+            }
+        }
+    }
+    Component {
+        id: delegate
+        Rectangle {
+            width: 50; height: 50
+            color: Qt.rgba(0.8/(parent.value+1),0.8/(parent.value+1),0.8/(parent.value+1),1.0)
+            Text {
+                text: parent.parent.value+1
+                color: "white"
+                font.pixelSize: 20
+                anchors.centerIn: parent
+            }
+        }
+    }
+}
diff --git a/examples/declarative/ui-components/tabwidget/TabWidget.qml b/examples/declarative/ui-components/tabwidget/TabWidget.qml
index f066fd2..2a74c46 100644
--- a/examples/declarative/ui-components/tabwidget/TabWidget.qml
+++ b/examples/declarative/ui-components/tabwidget/TabWidget.qml
@@ -45,8 +45,8 @@ Item {
 
     // Setting the default property to stack.children means any child items
     // of the TabWidget are actually added to the 'stack' item's children.
-    // See the "Extending Types from QML" documentation for details on default
-    // properties.
+    // See the "Writing QML Components: Properties, Methods and Signals"
+    // documentation for details on default properties.
     default property alias content: stack.children
 
     property int current: 0