diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-24 14:29:01 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 17:32:21 +0200 |
commit | aaaf60aeab64c4e9189dae6925a89e0b367e3dcf (patch) | |
tree | 6c2f3d4217245c7a61244a62f599206bd59c0a67 /tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | |
parent | ff453fa757c154e9234541c5cda47014a0803538 (diff) |
Remove usage of deprecated qWaitForWindowShown(QWidget *) method.
Remove usages from autotests with the exception of
widgets/kernel, widgets/widgets and widgets/graphicsview.
Change-Id: I917b2857ed0cd07a6b3dbcd69244f558086c6586
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp')
-rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index bd64777957..c3b7c597eb 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -1077,8 +1077,8 @@ void tst_QCompleter::multipleWidgets() QWidget window; window.show(); QApplication::setActiveWindow(&window); - QTest::qWaitForWindowShown(&window); - QTRY_VERIFY(qApp->activeWindow() == &window); + QVERIFY(QTest::qWaitForWindowActive(&window)); + QVERIFY(qApp->activeWindow() == &window); QFocusEvent focusIn(QEvent::FocusIn); QFocusEvent focusOut(QEvent::FocusOut); @@ -1494,8 +1494,8 @@ void tst_QCompleter::QTBUG_14292_filesystem() QWidget w; w.show(); QApplication::setActiveWindow(&w); - QTest::qWaitForWindowShown(&w); - QTRY_VERIFY(!edit.hasFocus() && !comp.popup()->hasFocus()); + QVERIFY(QTest::qWaitForWindowActive(&w)); + QVERIFY(!edit.hasFocus() && !comp.popup()->hasFocus()); QVERIFY(fs.createDirectory(tmpDir.filePath("hemo"))); //there is no reason creating a file should open a popup, it did in Qt 4.7.0 |