diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index 8320a036..e1ee2144 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -456,8 +456,8 @@ void tst_qdeclarativetext::alignments() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE_WITH_TIMEOUT(QApplication::activeWindow(), static_cast<QWidget *>(canvas), 10000); + QVERIFY(QTest::qWaitForWindowActive(canvas, 10000)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas)); QObject *ob = canvas->rootObject(); QVERIFY(ob != 0); @@ -1072,8 +1072,8 @@ void tst_qdeclarativetext::QTBUG_12291() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas)); QObject *ob = canvas->rootObject(); QVERIFY(ob != 0); @@ -1327,8 +1327,8 @@ void tst_qdeclarativetext::qtbug_14734() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas)); delete canvas; } |