summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@digia.com>2012-11-12 14:28:14 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-18 20:37:21 (GMT)
commit94be95934fb3f0ab339fd169ef529f05f1a6707d (patch)
tree262fab6596ed269d9917b5c4c069cfea65adf15f
parentf319483be7f0c8c91b3ebc4e9089f4747a2d7002 (diff)
downloadQt-94be95934fb3f0ab339fd169ef529f05f1a6707d.zip
Qt-94be95934fb3f0ab339fd169ef529f05f1a6707d.tar.gz
Qt-94be95934fb3f0ab339fd169ef529f05f1a6707d.tar.bz2
Fix failing tst_QWidget_window::tst_showWithoutActivating() test.
Change-Id: I3d7acf98f12ff71a6cea803ff7af430c66b972b8 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
-rw-r--r--tests/auto/qwidget_window/tst_qwidget_window.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qwidget_window/tst_qwidget_window.cpp b/tests/auto/qwidget_window/tst_qwidget_window.cpp
index 505ee29..c8b2762 100644
--- a/tests/auto/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/qwidget_window/tst_qwidget_window.cpp
@@ -299,6 +299,7 @@ void tst_QWidget_window::tst_showWithoutActivating()
QLineEdit *lineEdit = new QLineEdit;
lineEdit->setAttribute(Qt::WA_ShowWithoutActivating, true);
lineEdit->show();
+ QTest::qWaitForWindowShown(lineEdit);
lineEdit->setAttribute(Qt::WA_ShowWithoutActivating, false);
lineEdit->raise();
lineEdit->activateWindow();