diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-14 16:29:32 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-14 16:29:32 (GMT) |
| commit | 830df741afc987f12d744bfab8a4b9ee538c212a (patch) | |
| tree | fb2dd4a5f7f3ebde4b9270179d34e07b908716d0 | |
| parent | 6fa7d094f5250c8f8ceb77453280c79b2d227fad (diff) | |
| download | Qt-830df741afc987f12d744bfab8a4b9ee538c212a.zip Qt-830df741afc987f12d744bfab8a4b9ee538c212a.tar.gz Qt-830df741afc987f12d744bfab8a4b9ee538c212a.tar.bz2 | |
tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11
The last fix on Windows broke it on linux
Reviewed-by: thierry
| -rw-r--r-- | tests/auto/qcompleter/tst_qcompleter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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'); |