summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeparticles
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-03-18 01:10:05 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-03-18 01:10:05 (GMT)
commit19988e1a2b81ae4a54edb6fec1f489326ae39089 (patch)
tree2b993201c0e91ea4c037ac879c1558a3bc25b04e /tests/auto/declarative/qdeclarativeparticles
parent4b4e9be3ea5a267c8fc05d6ff5aca972d64eb705 (diff)
downloadQt-19988e1a2b81ae4a54edb6fec1f489326ae39089.zip
Qt-19988e1a2b81ae4a54edb6fec1f489326ae39089.tar.gz
Qt-19988e1a2b81ae4a54edb6fec1f489326ae39089.tar.bz2
Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
The import order has changed, so test files that mirror element names needed to be renamed (or they would resolve as the type).
Diffstat (limited to 'tests/auto/declarative/qdeclarativeparticles')
-rw-r--r--tests/auto/declarative/qdeclarativeparticles/data/particlemotiontest.qml (renamed from tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml)0
-rw-r--r--tests/auto/declarative/qdeclarativeparticles/data/particlestest.qml (renamed from tests/auto/declarative/qdeclarativeparticles/data/particles.qml)0
-rw-r--r--tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp8
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml b/tests/auto/declarative/qdeclarativeparticles/data/particlemotiontest.qml
index f1e4909..f1e4909 100644
--- a/tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particlemotiontest.qml
diff --git a/tests/auto/declarative/qdeclarativeparticles/data/particles.qml b/tests/auto/declarative/qdeclarativeparticles/data/particlestest.qml
index 4f168a9..4f168a9 100644
--- a/tests/auto/declarative/qdeclarativeparticles/data/particles.qml
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particlestest.qml
diff --git a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
index f4e9a27..093190c 100644
--- a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
+++ b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
@@ -65,7 +65,7 @@ tst_QDeclarativeParticles::tst_QDeclarativeParticles()
void tst_QDeclarativeParticles::properties()
{
- QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml");
+ QDeclarativeView *canvas = createView(SRCDIR "/data/particlestest.qml");
QVERIFY(canvas->rootObject());
QObject* particles = canvas->rootObject()->findChild<QObject*>("particles");
@@ -104,7 +104,7 @@ void tst_QDeclarativeParticles::properties()
void tst_QDeclarativeParticles::motionGravity()
{
- QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml");
+ QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotiontest.qml");
QVERIFY(canvas->rootObject());
QObject* particles = canvas->rootObject()->findChild<QObject*>("particles");
@@ -144,7 +144,7 @@ void tst_QDeclarativeParticles::motionGravity()
void tst_QDeclarativeParticles::motionWander()
{
- QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml");
+ QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotiontest.qml");
QVERIFY(canvas->rootObject());
QObject* particles = canvas->rootObject()->findChild<QObject*>("particles");
@@ -192,7 +192,7 @@ void tst_QDeclarativeParticles::motionWander()
void tst_QDeclarativeParticles::runs()
{
- QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml");
+ QDeclarativeView *canvas = createView(SRCDIR "/data/particlestest.qml");
QVERIFY(canvas->rootObject());
QObject* particles = canvas->rootObject()->findChild<QObject*>("particles");