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/qdeclarativepincharea/tst_qdeclarativepincharea.cpp | |
| 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/qdeclarativepincharea/tst_qdeclarativepincharea.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp index df22648f..b1c7de23 100644 --- a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp +++ b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp @@ -208,7 +208,7 @@ void tst_QDeclarativePinchArea::scale() canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pinchproperties.qml")); canvas->show(); canvas->setFocus(); - QTest::qWaitForWindowShown(canvas); + QVERIFY(QTest::qWaitForWindowExposed(canvas)); QVERIFY(canvas->rootObject() != 0); qApp->processEvents(); @@ -263,7 +263,7 @@ void tst_QDeclarativePinchArea::pan() canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pinchproperties.qml")); canvas->show(); canvas->setFocus(); - QTest::qWaitForWindowShown(canvas); + QVERIFY(QTest::qWaitForWindowExposed(canvas)); QVERIFY(canvas->rootObject() != 0); qApp->processEvents(); @@ -320,7 +320,7 @@ void tst_QDeclarativePinchArea::flickable() canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/flickresize.qml")); canvas->show(); canvas->setFocus(); - QTest::qWaitForWindowShown(canvas); + QVERIFY(QTest::qWaitForWindowExposed(canvas)); QVERIFY(canvas->rootObject() != 0); qApp->processEvents(); |