diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-04 09:50:22 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-13 12:32:52 +0000 |
| commit | 0dd3e02aacf7db51a1ab75170f9ceb759f334fec (patch) | |
| tree | 39fec0ff770f436d982443d374cdfbff55cc364a /tests/auto/widgets/util/qcompleter | |
| parent | 07f1c9665827bf9bc7dc70154fdee168c8118aaa (diff) | |
tests/auto/widgets/util: Avoid unconditional qWait()s
Task-number: QTBUG-63992
Change-Id: I795e564b051bbabd1fc2d2fca8171da6072f99eb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets/util/qcompleter')
| -rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index 6fbb0fe5fa..0511c278d5 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -1099,8 +1099,8 @@ void tst_QCompleter::multipleWidgets() comboBox->show(); window.activateWindow(); QApplication::setActiveWindow(&window); - QTest::qWait(50); - QTRY_COMPARE(QApplication::focusWidget(), comboBox); + QVERIFY(QTest::qWaitForWindowActive(&window)); + QCOMPARE(QApplication::focusWidget(), comboBox); comboBox->lineEdit()->setText("it"); QCOMPARE(comboBox->currentText(), QString("it")); // should not complete with setText QTest::keyPress(comboBox, 'e'); @@ -1112,7 +1112,6 @@ void tst_QCompleter::multipleWidgets() lineEdit->setCompleter(&completer); lineEdit->show(); lineEdit->setFocus(); - QTest::qWait(50); QTRY_COMPARE(QApplication::focusWidget(), lineEdit); lineEdit->setText("it"); QCOMPARE(lineEdit->text(), QString("it")); // should not completer with setText |