diff options
author | Bea Lam <bea.lam@nokia.com> | 2010-06-23 23:04:45 (GMT) |
---|---|---|
committer | Bea Lam <bea.lam@nokia.com> | 2010-06-23 23:07:17 (GMT) |
commit | 79c2f9d676d782212fb17f9158604e8158c47a22 (patch) | |
tree | 16e364239e51e0c281f8e5fd1c5b1b15ce8c5384 /tests/auto/declarative/qdeclarativeviewer | |
parent | 4b13e519f09c12a74c0bc522fd97e5009bd8bc2f (diff) | |
download | Qt-79c2f9d676d782212fb17f9158604e8158c47a22.zip Qt-79c2f9d676d782212fb17f9158604e8158c47a22.tar.gz Qt-79c2f9d676d782212fb17f9158604e8158c47a22.tar.bz2 |
Fix unstable qdeclarativeviewer tests
Diffstat (limited to 'tests/auto/declarative/qdeclarativeviewer')
-rw-r--r-- | tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index f30f758..1ea2a95 100644 --- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -261,7 +261,7 @@ void tst_QDeclarativeViewer::resizing() QCOMPARE(rootItem->width(), 150.0); QCOMPARE(rootItem->height(), 200.0); - QCOMPARE(viewer->view()->size(), QSize(150, 200)); + QTRY_COMPARE(viewer->view()->size(), QSize(150, 200)); QCOMPARE(viewer->view()->initialSize(), QSize(200, 300)); QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(150, 200)); QCOMPARE(viewer->size(), QSize(150, 200+viewer->menuBar()->height())); @@ -279,7 +279,7 @@ void tst_QDeclarativeViewer::resizing() QTRY_COMPARE(rootItem->width(), 250.0); QTRY_COMPARE(rootItem->height(), 350.0-viewer->menuBar()->height()); - QCOMPARE(viewer->view()->size(), QSize(250, 350-viewer->menuBar()->height())); + QTRY_COMPARE(viewer->view()->size(), QSize(250, 350-viewer->menuBar()->height())); QCOMPARE(viewer->view()->initialSize(), QSize(200, 300)); QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(250, 350-viewer->menuBar()->height())); QCOMPARE(viewer->size(), QSize(250, 350)); |