diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-24 14:56:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 16:53:08 +0200 |
| commit | c20463631ddbb4513bec100c22c74b8a919156a1 (patch) | |
| tree | a6f9d35185a7deb89e7ef568e4e4dd929f0d6982 /tests/auto/quick/qquickfontloader | |
| parent | 3bb7128fb705fa88ba955ca0ae6bd44fcef8fa4b (diff) | |
QtQuick: Remove usages of qWaitForWindowShown(QWindow *).
Change-Id: I722e20b2fb8d8c6c19c6f3f2cb16910d7433e9a4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/quick/qquickfontloader')
| -rw-r--r-- | tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp index c6eaf05d36..b5f47a96fd 100644 --- a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp +++ b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp @@ -251,8 +251,8 @@ void tst_qquickfontloader::changeFontSourceViaState() QQuickView window(testFileUrl("qtbug-20268.qml")); window.show(); window.requestActivateWindow(); - QTest::qWaitForWindowShown(&window); - QTRY_COMPARE(&window, qGuiApp->focusWindow()); + QVERIFY(QTest::qWaitForWindowActive(&window)); + QCOMPARE(&window, qGuiApp->focusWindow()); QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(qvariant_cast<QObject *>(window.rootObject()->property("fontloader"))); QVERIFY(fontObject != 0); |