From 830df741afc987f12d744bfab8a4b9ee538c212a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 14 Oct 2010 18:29:32 +0200 Subject: tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11 The last fix on Windows broke it on linux Reviewed-by: thierry --- tests/auto/qcompleter/tst_qcompleter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp index 425a230..650c328 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/qcompleter/tst_qcompleter.cpp @@ -1483,9 +1483,9 @@ void tst_QCompleter::QTBUG_14292_filesystem() edit.show(); QApplication::setActiveWindow(&edit); - edit.setFocus(); QTest::qWaitForWindowShown(&edit); QTRY_VERIFY(QApplication::activeWindow() == &edit); + edit.setFocus(); QTRY_VERIFY(edit.hasFocus()); QVERIFY(!comp.popup()->isVisible()); @@ -1493,6 +1493,7 @@ void tst_QCompleter::QTBUG_14292_filesystem() QTest::keyClick(&edit, '/'); QTRY_VERIFY(comp.popup()->isVisible()); QCOMPARE(comp.popup()->model()->rowCount(), 2); + QApplication::processEvents(); QTest::keyClick(&edit, 'h'); QCOMPARE(comp.popup()->model()->rowCount(), 2); QTest::keyClick(&edit, 'e'); -- cgit v0.12