diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-06-13 12:10:18 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 17:22:31 +0200 |
commit | 58f3f50c43f021ebfe214062562498d02b6f2071 (patch) | |
tree | 17e02ef27ee8d0e76eaf25f800836121b4c9b85e /tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | |
parent | e884e15615dc97c95704835756680b9c38be29ea (diff) |
Fix warnings in declarative tests.
- Unused variables and test data.
- () around operator &&.
- Conversion of false to 0-pointer where QVariant was intended.
- Missing enumeration value.
- Remove duplicated qqmlecmascript entry from qml.pro
(has an internal check for no-widgets).
Change-Id: Ie030167e22bce26e3988a4406c630fb460f61a3c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquicklistview/tst_qquicklistview.cpp')
-rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index 4997e5062c..dd6f82abe3 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -4169,7 +4169,6 @@ void tst_QQuickListView::repositionResizedDelegate() QFETCH(Qt::LayoutDirection, layoutDirection); QFETCH(QQuickItemView::VerticalLayoutDirection, verticalLayoutDirection); QFETCH(QPointF, contentPos_itemFirstHalfVisible); - QFETCH(QPointF, contentPos_itemStart); QFETCH(QPointF, contentPos_itemSecondHalfVisible); QFETCH(QRectF, origPositionerRect); QFETCH(QRectF, resizedPositionerRect); @@ -4238,32 +4237,31 @@ void tst_QQuickListView::repositionResizedDelegate_data() QTest::addColumn<Qt::LayoutDirection>("layoutDirection"); QTest::addColumn<QQuickListView::VerticalLayoutDirection>("verticalLayoutDirection"); QTest::addColumn<QPointF>("contentPos_itemFirstHalfVisible"); - QTest::addColumn<QPointF>("contentPos_itemStart"); QTest::addColumn<QPointF>("contentPos_itemSecondHalfVisible"); QTest::addColumn<QRectF>("origPositionerRect"); QTest::addColumn<QRectF>("resizedPositionerRect"); QTest::newRow("vertical") << QQuickListView::Vertical << Qt::LeftToRight << QQuickItemView::TopToBottom - << QPointF(0, 60) << QPointF(0, 200) << QPointF(0, 200 + 60) + << QPointF(0, 60) << QPointF(0, 200 + 60) << QRectF(0, 200, 120, 120) << QRectF(0, 200, 120, 120 * 2); QTest::newRow("vertical, BottomToTop") << QQuickListView::Vertical << Qt::LeftToRight << QQuickItemView::BottomToTop - << QPointF(0, -200 - 60) << QPointF(0, -200 - 200) << QPointF(0, -200 - 260) + << QPointF(0, -200 - 60) << QPointF(0, -200 - 260) << QRectF(0, -200 - 120, 120, 120) << QRectF(0, -200 - 120*2, 120, 120 * 2); QTest::newRow("horizontal") << QQuickListView::Horizontal<< Qt::LeftToRight << QQuickItemView::TopToBottom - << QPointF(60, 0) << QPointF(200, 0) << QPointF(260, 0) + << QPointF(60, 0) << QPointF(260, 0) << QRectF(200, 0, 120, 120) << QRectF(200, 0, 120 * 2, 120); QTest::newRow("horizontal, rtl") << QQuickListView::Horizontal << Qt::RightToLeft << QQuickItemView::TopToBottom - << QPointF(-200 - 60, 0) << QPointF(-200 - 200, 0) << QPointF(-200 - 260, 0) + << QPointF(-200 - 60, 0) << QPointF(-200 - 260, 0) << QRectF(-200 - 120, 0, 120, 120) << QRectF(-200 - 120 * 2, 0, 120 * 2, 120); } @@ -6238,6 +6236,7 @@ void tst_QQuickListView::displacedTransitions() break; case ListChange::SetCurrent: case ListChange::SetContentY: + case ListChange::Polish: break; } @@ -6484,6 +6483,8 @@ void tst_QQuickListView::multipleTransitions() listview->setContentY(changes[i].pos); QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false); break; + case ListChange::Polish: + break; } } QCOMPARE(listview->count(), model.count()); |