aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/particles/qquickitemparticle
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/particles/qquickitemparticle')
-rw-r--r--tests/auto/particles/qquickitemparticle/qquickitemparticle.pro5
-rw-r--r--tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp12
2 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro
index 262ebdd5b2..b275e4bf08 100644
--- a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro
+++ b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro
@@ -3,9 +3,8 @@ TARGET = tst_qquickitemparticle
SOURCES += tst_qquickitemparticle.cpp
macx:CONFIG -= app_bundle
-testDataFiles.files = data
-testDataFiles.path = .
-DEPLOYMENT += testDataFiles
+include (../../shared/util.pri)
+TESTDATA = data/*
QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib
diff --git a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
index a447a58b4b..629287ae83 100644
--- a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
+++ b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
@@ -45,24 +45,28 @@
#include <private/qquickimage_p.h>
#include <private/qabstractanimation_p.h>
-class tst_qquickitemparticle : public QObject
+#include "../../shared/util.h"
+
+class tst_qquickitemparticle : public QQmlDataTest
{
Q_OBJECT
public:
- tst_qquickitemparticle();
+ tst_qquickitemparticle() {}
private slots:
+ void initTestCase();
void test_basic();
};
-tst_qquickitemparticle::tst_qquickitemparticle()
+void tst_qquickitemparticle::initTestCase()
{
+ QQmlDataTest::initTestCase();
QUnifiedTimer::instance()->setConsistentTiming(true);
}
void tst_qquickitemparticle::test_basic()
{
- QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600);
+ QQuickView* view = createView(testFileUrl("basic.qml"), 600);
QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
ensureAnimTime(600, system->m_animation);