diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 07:28:11 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 07:28:11 (GMT) |
| commit | 7e774bedf20d5e0ec4ab799461f785a913a46947 (patch) | |
| tree | a58d5e7966f74c7094e42324542b3e0efa8f7156 /tests | |
| parent | ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254 (diff) | |
| parent | 7efc64e6a8dbf670bbc46243664d44df7acc5892 (diff) | |
| download | Qt-7e774bedf20d5e0ec4ab799461f785a913a46947.zip Qt-7e774bedf20d5e0ec4ab799461f785a913a46947.tar.gz Qt-7e774bedf20d5e0ec4ab799461f785a913a46947.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgridlayout/tst_qgridlayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp index 7c320be..46e2a03 100644 --- a/tests/auto/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp @@ -920,9 +920,9 @@ void tst_QGridLayout::minMaxSize() #if defined(Q_WS_X11) qt_x11_wait_for_window_manager(m_toplevel); // wait for the show #endif - QTest::qWait(20); + QTest::qWait(40); m_toplevel->adjustSize(); - QTest::qWait(120); // wait for the implicit adjustSize + QTest::qWait(240); // wait for the implicit adjustSize // If the following fails we might have to wait longer. // If that does not help there is likely a problem with the implicit adjustSize in show() if (!fixedSize.isValid()) { |