Item views: improve initial Z-value handling

Respect the initial Z-values of item, highlight, header, footer and
section delegate instances. Mention also the default values in docs.

Change-Id: I2ce4bb537898a0f5fdfa776b79d5747b1c080a7b
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>

3 files changed, 98 insertions, 4 deletions

diff --git a/tests/auto/quick/qquickgridview/data/boundZValues.qml b/tests/auto/quick/qquickgridview/data/boundZValues.qml
new file mode 100644
index 0000000000..7a1ca48a81
--- /dev/null
+++ b/tests/auto/quick/qquickgridview/data/boundZValues.qml
@@ -0,0 +1,46 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 240
+    height: 320
+
+    GridView {
+        id: grid
+
+        property real itemZ: 342
+        property real headerZ: 341
+        property real footerZ: 340
+        property real highlightZ: 339
+
+        anchors.fill: parent
+        objectName: "grid"
+        model: ListModel { ListElement { text: "text" } }
+        currentIndex: 0
+
+        delegate: Text {
+            objectName: "wrapper"
+            font.pointSize: 20
+            text: index
+            z: grid.itemZ
+        }
+
+        header: Rectangle {
+            width: 240
+            height: 30
+            z: grid.headerZ
+        }
+
+        footer: Rectangle {
+            width: 240
+            height: 30
+            z: grid.footerZ
+        }
+
+        highlight: Rectangle {
+            width: 240
+            height: 30
+            z: grid.highlightZ
+        }
+    }
+}
+
diff --git a/tests/auto/quick/qquickgridview/data/constantZValues.qml b/tests/auto/quick/qquickgridview/data/constantZValues.qml
new file mode 100644
index 0000000000..7cf564a12e
--- /dev/null
+++ b/tests/auto/quick/qquickgridview/data/constantZValues.qml
@@ -0,0 +1,46 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 240
+    height: 320
+
+    GridView {
+        id: grid
+
+        property real itemZ: 241
+        property real headerZ: 242
+        property real footerZ: 243
+        property real highlightZ: 244
+
+        anchors.fill: parent
+        objectName: "grid"
+        model: ListModel { ListElement { text: "text" } }
+        currentIndex: 0
+
+        delegate: Text {
+            objectName: "wrapper"
+            font.pointSize: 20
+            text: index
+            z: 241
+        }
+
+        header: Rectangle {
+            width: 240
+            height: 30
+            z: 242
+        }
+
+        footer: Rectangle {
+            width: 240
+            height: 30
+            z: 243
+        }
+
+        highlight: Rectangle {
+            width: 240
+            height: 30
+            z: 244
+        }
+    }
+}
+
diff --git a/tests/auto/quick/qquickgridview/data/initialZValues.qml b/tests/auto/quick/qquickgridview/data/defaultZValues.qml
index 9768b2c695..53f11bb2da 100644
--- a/tests/auto/quick/qquickgridview/data/initialZValues.qml
+++ b/tests/auto/quick/qquickgridview/data/defaultZValues.qml
@@ -7,11 +7,15 @@ Rectangle {
     GridView {
         id: grid
 
-        property real initialZ: 342
+        property real itemZ: 1
+        property real headerZ: 1
+        property real footerZ: 1
+        property real highlightZ: 0
 
         anchors.fill: parent
         objectName: "grid"
-        model: ListModel {}
+        model: ListModel { ListElement { text: "text" } }
+        currentIndex: 0
 
         delegate: Text {
             objectName: "wrapper"
@@ -22,13 +26,11 @@ Rectangle {
         header: Rectangle {
             width: 240
             height: 30
-            z: grid.initialZ
         }
 
         footer: Rectangle {
             width: 240
             height: 30
-            z: grid.initialZ
         }
     }
 }