diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-06-25 12:01:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:21:36 +0200 |
| commit | 5df94d89033e7bbb3f41840a4c07a628ed66b4d5 (patch) | |
| tree | e42bcd16d8f5f3a192c48794b610ffeb05b9dc02 /tests/auto/particles/qquickimageparticle | |
| parent | 2241d6fa2d39fe890ba0d17ff58b5e0615c1cd7b (diff) | |
Rename speed -> velocity in the particle system
Matches the convention set in the QtQuick module, for example by
ListView and Flickable.
Change-Id: I8df57ed1ced8128723d790c30c00cc1b2062787d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'tests/auto/particles/qquickimageparticle')
| -rw-r--r-- | tests/auto/particles/qquickimageparticle/data/deformed.qml | 2 | ||||
| -rw-r--r-- | tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/particles/qquickimageparticle/data/deformed.qml b/tests/auto/particles/qquickimageparticle/data/deformed.qml index c4ad331868..51cae4d56a 100644 --- a/tests/auto/particles/qquickimageparticle/data/deformed.qml +++ b/tests/auto/particles/qquickimageparticle/data/deformed.qml @@ -55,7 +55,7 @@ Rectangle { ImageParticle { source: "../../shared/star.png" rotation: 90 - rotationSpeed: 90 + rotationVelocity: 90 autoRotation: true yVector: PointDirection{x: 0.5; y: 0.5} xVector: PointDirection{x: 0.5; y: 0.5} diff --git a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp index cbc09fdb53..52a30753e7 100644 --- a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp +++ b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp @@ -108,7 +108,7 @@ void tst_qquickimageparticle::test_basic() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -152,7 +152,7 @@ void tst_qquickimageparticle::test_colored() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -197,7 +197,7 @@ void tst_qquickimageparticle::test_colorVariance() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -241,7 +241,7 @@ void tst_qquickimageparticle::test_deformed() QCOMPARE(d->yy, 0.5f); QCOMPARE(d->yx, 0.5f); QCOMPARE(d->rotation, 90.0f * (float)CONV_FACTOR); - QCOMPARE(d->rotationSpeed, 90.0f * (float)CONV_FACTOR); + QCOMPARE(d->rotationVelocity, 90.0f * (float)CONV_FACTOR); QCOMPARE(d->autoRotate, 1.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -285,7 +285,7 @@ void tst_qquickimageparticle::test_tabled() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -330,7 +330,7 @@ void tst_qquickimageparticle::test_sprite() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QVERIFY(myFuzzyCompare(d->frameDuration, 120.f)); QCOMPARE(d->frameCount, 6.0f); |