diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-17 11:58:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 11:43:41 +0200 |
| commit | 15e48b7387ae302a1b07a57b8374b097dc9c96a4 (patch) | |
| tree | d50a7680b1ebd99bacd944408f054d2ec61a3a4f /tests/auto/declarative/qdeclarativetext | |
| parent | 8c5d903d9c7c3ffe1113609a712943fb7c7398ad (diff) | |
QtQuick1: Use new qWaitForWindowExposed/Active() functions.
Change-Id: I020c82c465adaf6490a54871869bb6590542675f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativetext')
| -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; } |