diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2009-09-18 12:54:44 (GMT) |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2009-09-18 12:54:44 (GMT) |
| commit | 0e7e62eb6afbc1f20d08b837643009cec8eaacb9 (patch) | |
| tree | 1eb5f9fb0194b8a9ffa1d9ab961a0ac68db7508a /tests/auto/qmdiarea | |
| parent | b88bcd68a62ab8ed348bc698f7342346963bb7c0 (diff) | |
| parent | 421e02d7b48b4a852a4aa1e6feb781a64f0981b4 (diff) | |
| download | Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.zip Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.tar.gz Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.tar.bz2 | |
Merge commit 'origin/4.6' into kinetic-declarativeui
Conflicts:
configure.exe
Diffstat (limited to 'tests/auto/qmdiarea')
| -rw-r--r-- | tests/auto/qmdiarea/tst_qmdiarea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp index 1936c5b..65f1937 100644 --- a/tests/auto/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp @@ -1769,7 +1769,7 @@ void tst_QMdiArea::tileSubWindows() qt_x11_wait_for_window_manager(&workspace); #endif qApp->processEvents(); - QCOMPARE(workspace.size(), QSize(150, 150)); + QTRY_COMPARE(workspace.size(), QSize(150, 150)); // Horizontal scroll bar. QScrollBar *hBar = workspace.horizontalScrollBar(); |