aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/particles/qquickfriction
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-06-25 12:01:46 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-29 02:21:36 +0200
commit5df94d89033e7bbb3f41840a4c07a628ed66b4d5 (patch)
treee42bcd16d8f5f3a192c48794b610ffeb05b9dc02 /tests/auto/particles/qquickfriction
parent2241d6fa2d39fe890ba0d17ff58b5e0615c1cd7b (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/qquickfriction')
-rw-r--r--tests/auto/particles/qquickfriction/data/basic.qml4
-rw-r--r--tests/auto/particles/qquickfriction/data/threshold.qml4
-rw-r--r--tests/auto/particles/qquickfriction/tst_qquickfriction.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/particles/qquickfriction/data/basic.qml b/tests/auto/particles/qquickfriction/data/basic.qml
index 5d27f2a2b3..59d8939ec6 100644
--- a/tests/auto/particles/qquickfriction/data/basic.qml
+++ b/tests/auto/particles/qquickfriction/data/basic.qml
@@ -63,7 +63,7 @@ Rectangle {
Emitter{
//0,0 position
- speed: PointDirection{x:100}
+ velocity: PointDirection{x:100}
size: 32
emitRate: 1000
lifeSpan: 500
@@ -78,7 +78,7 @@ Rectangle {
//0,0 position
group: "notdefault"
y:200
- speed: PointDirection{x:100}
+ velocity: PointDirection{x:100}
size: 32
emitRate: 1000
lifeSpan: 500
diff --git a/tests/auto/particles/qquickfriction/data/threshold.qml b/tests/auto/particles/qquickfriction/data/threshold.qml
index 60386f9f24..01320f35c5 100644
--- a/tests/auto/particles/qquickfriction/data/threshold.qml
+++ b/tests/auto/particles/qquickfriction/data/threshold.qml
@@ -58,13 +58,13 @@ Rectangle {
}
Friction {
- factor: 1000 //speed limit 50
+ factor: 1000 //velocity limit 50
threshold: 50
}
Emitter{
//0,0 position
- speed: PointDirection{x:1000}
+ velocity: PointDirection{x:1000}
size: 32
emitRate: 1000
lifeSpan: 500
diff --git a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp
index c3559fa2d0..2beccd7e8f 100644
--- a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp
+++ b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp
@@ -114,7 +114,7 @@ void tst_qquickfriction::test_threshold()
QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
ensureAnimTime(600, system->m_animation);
- //Speed capped at 50, but it might take a frame or two to get there
+ //Velocity capped at 50, but it might take a frame or two to get there
QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
foreach (QQuickParticleData *d, system->groupData[0]->data) {
if (d->t == -1.0f)