From a2db1421375d8825ab12753af16d44f03f81b488 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Mon, 2 Apr 2012 11:34:50 +1000 Subject: 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 --- tests/auto/particles/particles.pro | 2 ++ tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro | 2 +- tests/auto/particles/qquickspritegoal/data/basic.qml | 4 ++-- tests/auto/particles/qquickspritegoal/qquickspritegoal.pro | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/auto/particles') 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 -- cgit v1.2.3