diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-12 18:00:17 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-12 18:19:44 (GMT) |
| commit | 6a1be803bf94b8af4a4766e31df9b441d1c81eed (patch) | |
| tree | 9ccccad91609ab85244b21ceb4c9934ec7fab707 /tests | |
| parent | f55d36cea933d801d421562f3d8b6b2ff0fb0fc1 (diff) | |
| download | Qt-6a1be803bf94b8af4a4766e31df9b441d1c81eed.zip Qt-6a1be803bf94b8af4a4766e31df9b441d1c81eed.tar.gz Qt-6a1be803bf94b8af4a4766e31df9b441d1c81eed.tar.bz2 | |
QGraphicsView tests on X11
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index c6ee237..49b76ac 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -6183,7 +6183,7 @@ void tst_QGraphicsItem::opacity2() MyGraphicsView view(&scene); view.show(); QTest::qWaitForWindowShown(&view); - QTRY_VERIFY(view.repaints > 1); + QTRY_VERIFY(view.repaints >= 1); #define RESET_REPAINT_COUNTERS \ parent->repaints = 0; \ diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 9db34bb..58d7896 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -3059,8 +3059,10 @@ void tst_QGraphicsProxyWidget::actionsContextMenu() QGraphicsView view(&scene); view.show(); + QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); view.setFocus(); + QTRY_VERIFY(view.hasFocus()); if (hasFocus) scene.addWidget(widget)->setFocus(); diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index 926335f..8acaa72 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -2945,7 +2945,7 @@ void tst_QGraphicsView::task239729_noViewUpdate() view->show(); QTest::qWaitForWindowShown(view); - QTRY_VERIFY(spy.count() > 1); + QTRY_VERIFY(spy.count() >= 1); spy.reset(); scene.update(); QApplication::processEvents(); |