summaryrefslogtreecommitdiffstats
path: root/tests/auto/qwidget
diff options
context:
space:
mode:
authorninerider <qt-info@nokia.com>2009-10-06 08:26:04 (GMT)
committerninerider <qt-info@nokia.com>2009-10-06 08:26:04 (GMT)
commit1459ba572cc3fdb72bf082b66a11bd88637b1b9c (patch)
treeceefa9bcbee5de869a830dba3e8abfb7e047b515 /tests/auto/qwidget
parent1015ee9016f3a46bb05077a9eff83c8736b2541e (diff)
parent843013460ff6ee60d3553a31faa3eedef88bd199 (diff)
downloadQt-1459ba572cc3fdb72bf082b66a11bd88637b1b9c.zip
Qt-1459ba572cc3fdb72bf082b66a11bd88637b1b9c.tar.gz
Qt-1459ba572cc3fdb72bf082b66a11bd88637b1b9c.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qwidget')
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 1b21527..f8341c3 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -9121,7 +9121,7 @@ void tst_QWidget::paintOutsidePaintEvent()
widget.show();
QTest::qWaitForWindowShown(&widget);
- QTest::qWait(20);
+ QTest::qWait(60);
const QPixmap before = QPixmap::grabWindow(widget.winId());
@@ -9131,6 +9131,7 @@ void tst_QWidget::paintOutsidePaintEvent()
painter.fillRect(child1.rect(), Qt::red);
painter.end();
XSync(QX11Info::display(), false); // Flush output buffer.
+ QTest::qWait(60);
const QPixmap after = QPixmap::grabWindow(widget.winId());