aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/particles
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-04-02 11:34:50 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-12 04:07:37 +0200
commita2db1421375d8825ab12753af16d44f03f81b488 (patch)
treeb98a1ec3aba8407ac8f8b90d30f8f138a6827cf0 /tests/auto/particles
parent71cc3fefefbd08c5abadf2f486a0360ec3cda643 (diff)
Get SpriteGoal and GroupGoal tests running again
Missing from particles.pro, and needed quick-private removed from their pro files. Also updated to match new sprite API, presumably these were missed because they weren't running before. Change-Id: I9be2d7f2b0bacc32c26829d40e91e8907c184906 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/particles')
-rw-r--r--tests/auto/particles/particles.pro2
-rw-r--r--tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro2
-rw-r--r--tests/auto/particles/qquickspritegoal/data/basic.qml4
-rw-r--r--tests/auto/particles/qquickspritegoal/qquickspritegoal.pro2
4 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/particles/particles.pro b/tests/auto/particles/particles.pro
index d376b9305e..265a1eabc7 100644
--- a/tests/auto/particles/particles.pro
+++ b/tests/auto/particles/particles.pro
@@ -7,6 +7,7 @@ PRIVATETESTS += \
qquickcustomaffector \
qquickcustomparticle \
qquickellipseextruder \
+ qquickgroupgoal \
qquickfriction \
qquickgravity \
qquickimageparticle \
@@ -18,6 +19,7 @@ PRIVATETESTS += \
qquickpointattractor \
qquickpointdirection \
qquickrectangleextruder \
+ qquickspritegoal \
qquicktargetdirection \
qquicktrailemitter \
qquickturbulence \
diff --git a/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro b/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
index f7f09ed9d0..6b5660289e 100644
--- a/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
+++ b/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
@@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private testlib
+QT += core-private gui-private v8-private qml-private testlib quick-private
diff --git a/tests/auto/particles/qquickspritegoal/data/basic.qml b/tests/auto/particles/qquickspritegoal/data/basic.qml
index 622f6bdd70..23effe3a68 100644
--- a/tests/auto/particles/qquickspritegoal/data/basic.qml
+++ b/tests/auto/particles/qquickspritegoal/data/basic.qml
@@ -57,12 +57,12 @@ Rectangle {
name: "happy"
source: "../../shared/squarefacesprite.png"
frames: 6
- duration: 120
+ frameDuration: 120
}, Sprite {
name: "twoHappy"
source: "../../shared/squarefacesprite.png"
frames: 3
- duration: 240
+ frameDuration: 240
}]
}
diff --git a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
index cfe932aabd..dc94c60149 100644
--- a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
+++ b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
@@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private testlib
+QT += core-private gui-private v8-private qml-private testlib quick-private