diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 13:47:35 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 13:47:35 (GMT) |
| commit | f8883337699d59e3b5eb9393067a24fb43fb2604 (patch) | |
| tree | 520b6c2a2f3724bce25fb5f88bad19e244ffb5a4 /tests | |
| parent | 3f1be3fa6db4714393dd3743807b4882334484ac (diff) | |
| parent | 6277b878a0d84621d1babef68af9150305fa4e35 (diff) | |
| download | Qt-f8883337699d59e3b5eb9393067a24fb43fb2604.zip Qt-f8883337699d59e3b5eb9393067a24fb43fb2604.tar.gz Qt-f8883337699d59e3b5eb9393067a24fb43fb2604.tar.bz2 | |
Merge remote branch 'platform-team/4.6' 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()) { |