From 1deba22774e59458dc2e485f1cdf8f5b547d2941 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 25 May 2012 17:33:02 +1000 Subject: Don't override "z" bindings for header and footer Headers and footers are given a default z value. This value should be set between Component beginCreate() and completeCreate() to avoid overwriting any binding in the header or footer item that has already set the 'z' value. Change-Id: I8e3ee97232d99500a32f2d77d2b663016eb404f7 Reviewed-by: Martin Jones --- .../quick/qquickgridview/tst_qquickgridview.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'tests/auto/quick/qquickgridview/tst_qquickgridview.cpp') diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index 8dc7fda49a..828a10242b 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -118,6 +118,7 @@ private slots: void manualHighlight(); void footer(); void footer_data(); + void initialZValues(); void header(); void header_data(); void extents(); @@ -3265,6 +3266,26 @@ void tst_QQuickGridView::footer_data() << QPointF(-(6 * 80) - 40, -320); } +void tst_QQuickGridView::initialZValues() +{ + QQuickView *canvas = createView(); + canvas->setSource(testFileUrl("initialZValues.qml")); + qApp->processEvents(); + + QQuickGridView *gridview = findItem(canvas->rootObject(), "grid"); + QTRY_VERIFY(gridview != 0); + QQuickItem *contentItem = gridview->contentItem(); + QTRY_VERIFY(contentItem != 0); + + QVERIFY(gridview->headerItem()); + QTRY_COMPARE(gridview->headerItem()->z(), gridview->property("initialZ").toReal()); + + QVERIFY(gridview->footerItem()); + QTRY_COMPARE(gridview->footerItem()->z(), gridview->property("initialZ").toReal()); + + delete canvas; +} + void tst_QQuickGridView::header() { QFETCH(QQuickGridView::Flow, flow); -- cgit v1.2.3