aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/particles/qquicktargetdirection
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/particles/qquicktargetdirection')
-rw-r--r--tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro5
-rw-r--r--tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp12
2 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro
index 226cd9d139..a4a09ae6de 100644
--- a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro
+++ b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro
@@ -3,9 +3,8 @@ TARGET = tst_qquicktargetdirection
SOURCES += tst_qquicktargetdirection.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/qquicktargetdirection/tst_qquicktargetdirection.cpp b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp
index 666bed8e17..2362be96ca 100644
--- a/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp
+++ b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp
@@ -44,24 +44,28 @@
#include <private/qquickparticlesystem_p.h>
#include <private/qabstractanimation_p.h>
-class tst_qquicktargetdirection : public QObject
+#include "../../shared/util.h"
+
+class tst_qquicktargetdirection : public QQmlDataTest
{
Q_OBJECT
public:
- tst_qquicktargetdirection();
+ tst_qquicktargetdirection() {}
private slots:
+ void initTestCase();
void test_basic();
};
-tst_qquicktargetdirection::tst_qquicktargetdirection()
+void tst_qquicktargetdirection::initTestCase()
{
+ QQmlDataTest::initTestCase();
QUnifiedTimer::instance()->setConsistentTiming(true);
}
void tst_qquicktargetdirection::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);