diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-11 01:45:01 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-11 01:45:01 (GMT) |
| commit | 947358481f27ae44423d218aaece36375a2f7a2d (patch) | |
| tree | bad43eb4a5009bae4c4c26ce6efab871bc68eb99 /tests | |
| parent | f50b196c3bf2b18e3b1e66f8459be94b42326dc6 (diff) | |
| download | Qt-947358481f27ae44423d218aaece36375a2f7a2d.zip Qt-947358481f27ae44423d218aaece36375a2f7a2d.tar.gz Qt-947358481f27ae44423d218aaece36375a2f7a2d.tar.bz2 | |
Fix qmlviewer test failure on windows
Attempted to make window size smaller than Windows minimum.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index ef99173..c249414 100644 --- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -255,21 +255,21 @@ void tst_QDeclarativeViewer::resizing() viewer->setSizeToView(false); // size view to root object - rootItem->setWidth(100); + rootItem->setWidth(150); rootItem->setHeight(200); qApp->processEvents(); - QCOMPARE(rootItem->width(), 100.0); + QCOMPARE(rootItem->width(), 150.0); QCOMPARE(rootItem->height(), 200.0); - QCOMPARE(viewer->view()->size(), QSize(100, 200)); + QCOMPARE(viewer->view()->size(), QSize(150, 200)); QCOMPARE(viewer->view()->initialSize(), QSize(200, 300)); - QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(100, 200)); - QCOMPARE(viewer->size(), QSize(100, 200+viewer->menuBar()->height())); + QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(150, 200)); + QCOMPARE(viewer->size(), QSize(150, 200+viewer->menuBar()->height())); QCOMPARE(viewer->size(), viewer->sizeHint()); // do not size root object to view - viewer->resize(QSize(150,250)); - QCOMPARE(rootItem->width(), 100.0); + viewer->resize(QSize(180,250)); + QCOMPARE(rootItem->width(), 150.0); QCOMPARE(rootItem->height(), 200.0); viewer->setSizeToView(true); @@ -287,7 +287,7 @@ void tst_QDeclarativeViewer::resizing() QCOMPARE(viewer->size(), viewer->sizeHint()); // do not size view to root object - rootItem->setWidth(100); + rootItem->setWidth(150); rootItem->setHeight(200); QTRY_COMPARE(viewer->size(), QSize(250, 350)); } |