summaryrefslogtreecommitdiffstats
path: root/tests/auto/qwidget
diff options
context:
space:
mode:
authorBjoern Erik Nilsen <bjorn.nilsen@nokia.com>2009-04-07 10:59:16 (GMT)
committerBjoern Erik Nilsen <bjorn.nilsen@nokia.com>2009-04-07 10:59:16 (GMT)
commit6e13559503040963c28dd8f5b6881e3a2b9d5596 (patch)
tree3e030548ffb1667d5fa8cd2020fd7b28749d0411 /tests/auto/qwidget
parent939623b2bc8e441618ee1a1886cc656880bee62b (diff)
parentd8f76432c3937690c37972136c02a5a264bc941f (diff)
downloadQt-6e13559503040963c28dd8f5b6881e3a2b9d5596.zip
Qt-6e13559503040963c28dd8f5b6881e3a2b9d5596.tar.gz
Qt-6e13559503040963c28dd8f5b6881e3a2b9d5596.tar.bz2
Merge commit 'origin/4.5'
Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
Diffstat (limited to 'tests/auto/qwidget')
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 9197144..cdffcc0 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -8746,7 +8746,9 @@ void tst_QWidget::toplevelLineEditFocus()
QLineEdit w;
w.show();
+#ifdef Q_WS_X11
qt_x11_wait_for_window_manager(&w);
+#endif
QTest::qWait(200);
QCOMPARE(QApplication::activeWindow(), &w);