diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-11 11:08:11 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-11 12:00:31 +0100 |
commit | 7c9497a6d47a02d961baef3993ba4cf4267ec607 (patch) | |
tree | 335fae3e9e3a84d33310efca23f1d6993265805b /tests/auto/quick/qquicklistview | |
parent | 67ba88947f57ab2d1859bbeb96c6dcba020561b1 (diff) | |
parent | 6c840c70d61c3ae277b60a024a086215c743e5b3 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arrayobject.cpp
src/qml/jsruntime/qv4context.cpp
Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1
Diffstat (limited to 'tests/auto/quick/qquicklistview')
-rw-r--r-- | tests/auto/quick/qquicklistview/data/headerCrash.qml | 20 | ||||
-rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 39 |
2 files changed, 50 insertions, 9 deletions
diff --git a/tests/auto/quick/qquicklistview/data/headerCrash.qml b/tests/auto/quick/qquicklistview/data/headerCrash.qml new file mode 100644 index 0000000000..124fa894f2 --- /dev/null +++ b/tests/auto/quick/qquicklistview/data/headerCrash.qml @@ -0,0 +1,20 @@ +import QtQuick 2.0 + +ListView { + id: myList + + width: 400; height: 400 + model: 10 + + header: Item { + height: parent ? 20 : 10 + width: 400 + } + + delegate: Rectangle { + width: parent.width; height: 20 + color: index % 2 ? "green" : "red" + } + + Component.onCompleted: myList.verticalLayoutDirection = ListView.BottomToTop +} diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index f741fec159..7d0b76ad63 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -219,6 +219,8 @@ private slots: void highlightItemGeometryChanges(); + void QTBUG_36481(); + private: template <class T> void items(const QUrl &source); template <class T> void changed(const QUrl &source); @@ -3918,7 +3920,8 @@ void tst_QQuickListView::extents() QFETCH(QPointF, minPos); QFETCH(QPointF, maxPos); QFETCH(QPointF, origin_empty); - QFETCH(QPointF, origin_nonEmpty); + QFETCH(QPointF, origin_short); + QFETCH(QPointF, origin_long); QQuickView *window = getView(); @@ -3955,12 +3958,20 @@ void tst_QQuickListView::extents() QCOMPARE(listview->originX(), origin_empty.x()); QCOMPARE(listview->originY(), origin_empty.y()); - for (int i=0; i<30; i++) + + for (int i=0; i<3; i++) + model.addItem("Item" + QString::number(i), ""); + listview->forceLayout(); + QTRY_COMPARE(listview->count(), model.count()); + QCOMPARE(listview->originX(), origin_short.x()); + QCOMPARE(listview->originY(), origin_short.y()); + + for (int i=3; i<30; i++) model.addItem("Item" + QString::number(i), ""); listview->forceLayout(); QTRY_COMPARE(listview->count(), model.count()); - QCOMPARE(listview->originX(), origin_nonEmpty.x()); - QCOMPARE(listview->originY(), origin_nonEmpty.y()); + QCOMPARE(listview->originX(), origin_long.x()); + QCOMPARE(listview->originY(), origin_long.y()); releaseView(window); } @@ -3975,7 +3986,8 @@ void tst_QQuickListView::extents_data() QTest::addColumn<QPointF>("minPos"); QTest::addColumn<QPointF>("maxPos"); QTest::addColumn<QPointF>("origin_empty"); - QTest::addColumn<QPointF>("origin_nonEmpty"); + QTest::addColumn<QPointF>("origin_short"); + QTest::addColumn<QPointF>("origin_long"); // header is 240x20 (or 20x320 in Horizontal orientation) // footer is 240x30 (or 30x320 in Horizontal orientation) @@ -3984,25 +3996,25 @@ void tst_QQuickListView::extents_data() << QQuickListView::Vertical << Qt::LeftToRight << QQuickItemView::TopToBottom << QPointF(0, -20) << QPointF(0, 0) << QPointF(0, 20) << QPointF(240, 20) - << QPointF(0, -20) << QPointF(0, -20); + << QPointF(0, -20) << QPointF(0, -20) << QPointF(0, -20); QTest::newRow("Vertical, BottomToTop") << QQuickListView::Vertical << Qt::LeftToRight << QQuickItemView::BottomToTop << QPointF(0, 0) << QPointF(0, -30) << QPointF(0, 320 - 20) << QPointF(240, 320 - 20) // content flow is reversed - << QPointF(0, -30) << QPointF(0, (-30.0 * 30) - 30); + << QPointF(0, -30) << QPointF(0, (-30.0 * 3) - 30) << QPointF(0, (-30.0 * 30) - 30); QTest::newRow("Horizontal, LeftToRight") << QQuickListView::Horizontal << Qt::LeftToRight << QQuickItemView::TopToBottom << QPointF(-20, 0) << QPointF(0, 0) << QPointF(20, 0) << QPointF(20, 320) - << QPointF(-20, 0) << QPointF(-20, 0); + << QPointF(-20, 0) << QPointF(-20, 0) << QPointF(-20, 0); QTest::newRow("Horizontal, RightToLeft") << QQuickListView::Horizontal << Qt::RightToLeft << QQuickItemView::TopToBottom << QPointF(0, 0) << QPointF(-30, 0) << QPointF(240 - 20, 0) << QPointF(240 - 20, 320) // content flow is reversed - << QPointF(-30, 0) << QPointF((-240.0 * 30) - 30, 0); + << QPointF(-30, 0) << QPointF((-240.0 * 3) - 30, 0) << QPointF((-240.0 * 30) - 30, 0); } void tst_QQuickListView::resetModel_headerFooter() @@ -7096,6 +7108,15 @@ void tst_QQuickListView::highlightItemGeometryChanges() } } +void tst_QQuickListView::QTBUG_36481() +{ + QQmlEngine engine; + QQmlComponent component(&engine, testFileUrl("headerCrash.qml")); + + // just testing that we don't crash when creating + QScopedPointer<QObject> object(component.create()); +} + QTEST_MAIN(tst_QQuickListView) #include "tst_qquicklistview.moc" |