diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-08-26 23:31:56 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-08-26 23:31:56 (GMT) |
| commit | bf37dc89a67d48cc176df7faaa903bf01762053f (patch) | |
| tree | 2a46171a8b5e0639c9c32125aafd920404cf5e15 /tests/auto/declarative/qdeclarativegridview | |
| parent | b4116c58cacc46732ff24db1ea8bf082fcb4b489 (diff) | |
| parent | d477cc1498ccf2204dd0e5cd6676f5c0788a9090 (diff) | |
| download | Qt-bf37dc89a67d48cc176df7faaa903bf01762053f.zip Qt-bf37dc89a67d48cc176df7faaa903bf01762053f.tar.gz Qt-bf37dc89a67d48cc176df7faaa903bf01762053f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativegridview')
| -rw-r--r-- | tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp index 1a28b71..896d69e 100644 --- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp +++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp @@ -590,7 +590,7 @@ void tst_QDeclarativeGridView::currentIndex() QCOMPARE(gridview->currentIndex(), 35); QCOMPARE(gridview->currentItem(), findItem<QDeclarativeItem>(contentItem, "wrapper", 35)); QCOMPARE(gridview->currentItem()->y(), gridview->highlightItem()->y()); - QCOMPARE(gridview->contentY(), 399.0); + QCOMPARE(gridview->contentY(), 400.0); gridview->moveCurrentIndexRight(); QCOMPARE(gridview->currentIndex(), 36); @@ -629,7 +629,7 @@ void tst_QDeclarativeGridView::currentIndex() gridview->moveCurrentIndexLeft(); QCOMPARE(gridview->currentIndex(), model.count()-1); - QTRY_COMPARE(gridview->contentY(), 879.0); + QTRY_COMPARE(gridview->contentY(), 880.0); gridview->moveCurrentIndexRight(); QCOMPARE(gridview->currentIndex(), 0); |