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/qdeclarativepathview | |
| 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/qdeclarativepathview')
| -rw-r--r-- | tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp index e29462c1..52ce97d7 100644 --- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp +++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp @@ -908,8 +908,8 @@ void tst_QDeclarativePathView::mouseDrag() canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/dragpath.qml")); 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)); QDeclarativePathView *pathview = qobject_cast<QDeclarativePathView*>(canvas->rootObject()); QVERIFY(pathview != 0); @@ -968,8 +968,8 @@ void tst_QDeclarativePathView::changePreferredHighlight() canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/dragpath.qml")); 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)); QDeclarativePathView *pathview = qobject_cast<QDeclarativePathView*>(canvas->rootObject()); QVERIFY(pathview != 0); |