diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-09-26 13:13:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 01:12:34 +0200 |
| commit | 40864ee84e41d53c412dd1b350624dcde07b009a (patch) | |
| tree | fbdf72cd3e01a408e54f025bd2a8d5fe375ec905 /tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp | |
| parent | 6c0215a523b1294015e238018dc34cf56a46024c (diff) | |
Manually apply SnapOneItem/Row changes from Qt 4.7
Apply following changes to Qt 5 for both QtQuick1 and QtQuick2 items:
cf23188de237009136fa1480ab8fd9e3ca364769
f85819fe083ae7c6804c884de68e906d153a6d11
09cd2f818208a83489fae034b80e6497b7cc83af
Task-number: QTBUG-20683
Change-Id: I974764e57e3004514bb4c9f46c5152ad07c136a7
Reviewed-on: http://codereview.qt-project.org/5484
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp')
| -rw-r--r-- | tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp index e96af5100c..c370a01d11 100644 --- a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp +++ b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp @@ -448,12 +448,12 @@ void tst_QDeclarative1GridView::removed() model.removeItem(1); // Confirm items positioned correctly - for (int i = 6; i < 18; ++i) { + for (int i = 3; i < 15; ++i) { QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem, "wrapper", i); if (!item) qWarning() << "Item" << i << "not found"; QTRY_VERIFY(item); - QTRY_VERIFY(item->x() == (i%3)*80); - QTRY_VERIFY(item->y() == (i/3)*60); + QTRY_COMPARE(item->x(), (i%3)*80.0); + QTRY_COMPARE(item->y(), 60+(i/3)*60.0); } // Remove currentIndex @@ -474,7 +474,7 @@ void tst_QDeclarative1GridView::removed() if (!item) qWarning() << "Item" << i << "not found"; QTRY_VERIFY(item); QTRY_VERIFY(item->x() == (i%3)*80); - QTRY_VERIFY(item->y() == (i/3)*60); + QTRY_VERIFY(item->y() == 60+(i/3)*60); } // remove item outside current view. |