diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-03-10 15:58:10 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-18 09:05:57 +0100 |
commit | c4c5129632591738c290058abab281ad1b1493c1 (patch) | |
tree | 1281f2a4f3ea9da5da55a7720def36e077716afe /tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | |
parent | fa24ef3d721a7b94d0c5abbc6c9558e74bdb0f3d (diff) |
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>
Diffstat (limited to 'tests/auto/quick/qquicklistview/tst_qquicklistview.cpp')
-rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index efd0fa8103..60c2fadb23 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -147,6 +147,7 @@ private slots: void modelChanges(); void manualHighlight(); void initialZValues(); + void initialZValues_data(); void header(); void header_data(); void header_delayItemCreation(); @@ -3465,8 +3466,9 @@ void tst_QQuickListView::QTBUG_11105() void tst_QQuickListView::initialZValues() { + QFETCH(QString, fileName); QQuickView *window = createView(); - window->setSource(testFileUrl("initialZValues.qml")); + window->setSource(testFileUrl(fileName)); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list"); @@ -3474,15 +3476,33 @@ void tst_QQuickListView::initialZValues() QQuickItem *contentItem = listview->contentItem(); QTRY_VERIFY(contentItem != 0); + QVERIFY(listview->currentItem()); + QTRY_COMPARE(listview->currentItem()->z(), listview->property("itemZ").toReal()); + QVERIFY(listview->headerItem()); - QTRY_COMPARE(listview->headerItem()->z(), listview->property("initialZ").toReal()); + QTRY_COMPARE(listview->headerItem()->z(), listview->property("headerZ").toReal()); QVERIFY(listview->footerItem()); - QTRY_COMPARE(listview->footerItem()->z(), listview->property("initialZ").toReal()); + QTRY_COMPARE(listview->footerItem()->z(), listview->property("footerZ").toReal()); + + QVERIFY(listview->highlightItem()); + QTRY_COMPARE(listview->highlightItem()->z(), listview->property("highlightZ").toReal()); + + QQuickText *sectionItem = 0; + QTRY_VERIFY(sectionItem = findItem<QQuickText>(contentItem, "section")); + QTRY_COMPARE(sectionItem->z(), listview->property("sectionZ").toReal()); delete window; } +void tst_QQuickListView::initialZValues_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::newRow("defaults") << "defaultZValues.qml"; + QTest::newRow("constants") << "constantZValues.qml"; + QTest::newRow("bindings") << "boundZValues.qml"; +} + void tst_QQuickListView::header() { QFETCH(QQuickListView::Orientation, orientation); |