diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-18 14:02:52 +1000 |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-19 06:56:19 +0100 |
commit | 7c7686dcc21a07f16f9dccf4993d234ca18e5ab6 (patch) | |
tree | 06860b181a36d8c9f070dc71e333d8c3db2edc0c /tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp | |
parent | a3acd5429eb3c1bca9a143425d22e723e9ebfa2e (diff) |
Rename animation backend classes.
Change-Id: I8796086097b5464dbe16a92df055e5a153971f21
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp')
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index a661711c65..02c2fc3f43 100644 --- a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -888,7 +888,7 @@ void tst_qdeclarativeanimations::propertyValueSourceDefaultStart() QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim"); QVERIFY(myAnim && !myAnim->qtAnimation()); - //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation2::Stopped); + //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimationJob::Stopped); } } @@ -907,7 +907,7 @@ void tst_qdeclarativeanimations::dontStart() QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim"); QVERIFY(myAnim && !myAnim->qtAnimation()); - //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation2::Stopped); + //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimationJob::Stopped); } { @@ -922,7 +922,7 @@ void tst_qdeclarativeanimations::dontStart() QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim"); QVERIFY(myAnim && !myAnim->qtAnimation()); - //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation2::Stopped); + //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimationJob::Stopped); } } @@ -1086,7 +1086,7 @@ void tst_qdeclarativeanimations::doubleRegistrationBug() QDeclarativeAbstractAnimation *anim = rect->findChild<QDeclarativeAbstractAnimation*>("animation"); QVERIFY(anim != 0); - QTRY_COMPARE(anim->qtAnimation()->state(), QAbstractAnimation2::Stopped); + QTRY_COMPARE(anim->qtAnimation()->state(), QAbstractAnimationJob::Stopped); } //QTBUG-16736 @@ -1110,7 +1110,7 @@ void tst_qdeclarativeanimations::alwaysRunToEndRestartBug() QVERIFY(rect.x() != qreal(200)); QTest::qWait(800); QTIMED_COMPARE(rect.x(), qreal(200)); - QCOMPARE(static_cast<QDeclarativeAbstractAnimation*>(&animation)->qtAnimation()->state(), QAbstractAnimation2::Stopped); + QCOMPARE(static_cast<QDeclarativeAbstractAnimation*>(&animation)->qtAnimation()->state(), QAbstractAnimationJob::Stopped); } //QTBUG-20227 @@ -1134,7 +1134,7 @@ void tst_qdeclarativeanimations::pauseBindingBug() QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QDeclarativeAbstractAnimation *anim = rect->findChild<QDeclarativeAbstractAnimation*>("animation"); - QVERIFY(anim->qtAnimation()->state() == QAbstractAnimation2::Paused); + QVERIFY(anim->qtAnimation()->state() == QAbstractAnimationJob::Paused); delete rect; } @@ -1147,7 +1147,7 @@ void tst_qdeclarativeanimations::pauseBug() QDeclarativeComponent c(&engine, testFileUrl("pauseBug.qml")); QDeclarativeAbstractAnimation *anim = qobject_cast<QDeclarativeAbstractAnimation*>(c.create()); QVERIFY(anim != 0); - QCOMPARE(anim->qtAnimation()->state(), QAbstractAnimation2::Paused); + QCOMPARE(anim->qtAnimation()->state(), QAbstractAnimationJob::Paused); QCOMPARE(anim->isPaused(), true); QCOMPARE(anim->isRunning(), true); |