diff options
Diffstat (limited to 'tests/auto/particles/qquickcustomparticle')
-rw-r--r-- | tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro | 5 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro index a12c1af62c..6666c91d7e 100644 --- a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro +++ b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro @@ -3,9 +3,8 @@ TARGET = tst_qquickcustomparticle SOURCES += tst_qquickcustomparticle.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/qquickcustomparticle/tst_qquickcustomparticle.cpp b/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp index 237fc301d9..a54e10afc6 100644 --- a/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp +++ b/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp @@ -44,24 +44,28 @@ #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qquickcustomparticle : public QObject +#include "../../shared/util.h" + +class tst_qquickcustomparticle : public QQmlDataTest { Q_OBJECT public: - tst_qquickcustomparticle(); + tst_qquickcustomparticle() {} private slots: + void initTestCase(); void test_basic(); }; -tst_qquickcustomparticle::tst_qquickcustomparticle() +void tst_qquickcustomparticle::initTestCase() { + QQmlDataTest::initTestCase(); QUnifiedTimer::instance()->setConsistentTiming(true); } void tst_qquickcustomparticle::test_basic() { - QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(testFileUrl("basic.qml"), 600); QVERIFY(view); QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); |