diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-15 14:23:50 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-15 14:23:50 (GMT) |
| commit | bdc951eb87e0b1aa752d3ec750cfd837714bd8b7 (patch) | |
| tree | 65f9abe4c72b112118fac79cc6c46bcd379aebf2 /tests/auto/qwidget/tst_qwidget.cpp | |
| parent | 6b08c50f93236fec9ed24eaf36f839315e8dc08e (diff) | |
| parent | 2eee73e843ba7b4c6e83bd6bfaa08994520c417d (diff) | |
| download | Qt-bdc951eb87e0b1aa752d3ec750cfd837714bd8b7.zip Qt-bdc951eb87e0b1aa752d3ec750cfd837714bd8b7.tar.gz Qt-bdc951eb87e0b1aa752d3ec750cfd837714bd8b7.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Diffstat (limited to 'tests/auto/qwidget/tst_qwidget.cpp')
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index c000a12..daeee3d 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -7459,11 +7459,11 @@ void tst_QWidget::updateWhileMinimized() QTest::qWaitForWindowShown(&widget); QApplication::processEvents(); QTRY_VERIFY(widget.numPaintEvents > 0); - QTest::qWait(50); + QTest::qWait(150); // Minimize window. widget.showMinimized(); - QTest::qWait(70); + QTest::qWait(110); widget.reset(); @@ -8164,7 +8164,7 @@ public: static bool firstTime = true; if (firstTime) - QTimer::singleShot(150, this, SLOT(resizeMe())); + QTimer::singleShot(250, this, SLOT(resizeMe())); firstTime = false; } @@ -8181,7 +8181,7 @@ void tst_QWidget::moveInResizeEvent() testWidget.setGeometry(50, 50, 200, 200); testWidget.show(); QTest::qWaitForWindowShown(&testWidget); - QTest::qWait(160); + QTest::qWait(300); QRect expectedGeometry(100,100, 100, 100); QTRY_COMPARE(testWidget.geometry(), expectedGeometry); |