diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-10-25 07:57:54 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 00:00:42 +0200 |
commit | d6cc95cee7c42803793a70988d85e2d3164b17f7 (patch) | |
tree | b0c137e6d40bc62069e64ffbfef949de6c04423c /tests/auto/particles | |
parent | 198ab5fa2400fac490f2d2ebbb97d988fe3f69b8 (diff) |
Rename QSG* to QQuick* in particles folder
Change-Id: I793eaf16f3810df0cb0f9f8482ac0b9d6137595d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests/auto/particles')
-rw-r--r-- | tests/auto/particles/particles.pro | 42 | ||||
-rw-r--r-- | tests/auto/particles/qquickage/data/jump.qml (renamed from tests/auto/particles/qsgage/data/jump.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickage/data/kill.qml (renamed from tests/auto/particles/qsgage/data/kill.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickage/data/onceoff.qml (renamed from tests/auto/particles/qsgage/data/onceoff.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickage/data/sustained.qml (renamed from tests/auto/particles/qsgage/data/sustained.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickage/qquickage.pro (renamed from tests/auto/particles/qsgage/qsgage.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquickage/tst_qquickage.cpp (renamed from tests/auto/particles/qsgage/tst_qsgage.cpp) | 36 | ||||
-rw-r--r-- | tests/auto/particles/qquickangleddirection/data/basic.qml (renamed from tests/auto/particles/qsgangleddirection/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickangleddirection/qquickangleddirection.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp (renamed from tests/auto/particles/qsgangleddirection/tst_qsgangleddirection.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickcumulativedirection/data/basic.qml (renamed from tests/auto/particles/qsgcumulativedirection/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp (renamed from tests/auto/particles/qsgcumulativedirection/tst_qsgcumulativedirection.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomaffector/data/basic.qml (renamed from tests/auto/particles/qsgcustomaffector/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomaffector/data/move.qml (renamed from tests/auto/particles/qsgcustomaffector/data/move.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp (renamed from tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp) | 24 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomparticle/data/basic.qml (renamed from tests/auto/particles/qsgcustomparticle/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp (renamed from tests/auto/particles/qsgcustomparticle/tst_qsgcustomparticle.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickellipseextruder/data/basic.qml (renamed from tests/auto/particles/qsgellipseextruder/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp (renamed from tests/auto/particles/qsgellipseextruder/tst_qsgellipseextruder.cpp) | 22 | ||||
-rw-r--r-- | tests/auto/particles/qquickfriction/data/basic.qml (renamed from tests/auto/particles/qsgfriction/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickfriction/data/threshold.qml (renamed from tests/auto/particles/qsgfriction/data/threshold.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickfriction/qquickfriction.pro (renamed from tests/auto/particles/qsgturbulence/qsgturbulence.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquickfriction/tst_qquickfriction.cpp (renamed from tests/auto/particles/qsgfriction/tst_qsgfriction.cpp) | 26 | ||||
-rw-r--r-- | tests/auto/particles/qquickgravity/data/basic.qml (renamed from tests/auto/particles/qsggravity/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickgravity/qquickgravity.pro (renamed from tests/auto/particles/qsggravity/qsggravity.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquickgravity/tst_qquickgravity.cpp (renamed from tests/auto/particles/qsggravity/tst_qsggravity.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickimageparticle/data/basic.qml (renamed from tests/auto/particles/qsgimageparticle/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickimageparticle/data/colored.qml (renamed from tests/auto/particles/qsgimageparticle/data/colored.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickimageparticle/data/deformed.qml (renamed from tests/auto/particles/qsgimageparticle/data/deformed.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickimageparticle/data/sprite.qml (renamed from tests/auto/particles/qsgimageparticle/data/sprite.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickimageparticle/data/tabled.qml (renamed from tests/auto/particles/qsgimageparticle/data/tabled.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickimageparticle/qquickimageparticle.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp (renamed from tests/auto/particles/qsgimageparticle/tst_qsgimageparticle.cpp) | 42 | ||||
-rw-r--r-- | tests/auto/particles/qquickitemparticle/data/basic.qml (renamed from tests/auto/particles/qsgitemparticle/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickitemparticle/qquickitemparticle.pro (renamed from tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp (renamed from tests/auto/particles/qsgitemparticle/tst_qsgitemparticle.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquicklineextruder/data/basic.qml (renamed from tests/auto/particles/qsglineextruder/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquicklineextruder/qquicklineextruder.pro (renamed from tests/auto/particles/qsgangleddirection/qsgangleddirection.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp (renamed from tests/auto/particles/qsglineextruder/tst_qsglineextruder.cpp) | 20 | ||||
-rw-r--r-- | tests/auto/particles/qquickmaskextruder/data/basic.qml (renamed from tests/auto/particles/qsgmaskextruder/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickmaskextruder/data/smallmask.png (renamed from tests/auto/particles/qsgmaskextruder/data/smallmask.png) | bin | 719 -> 719 bytes | |||
-rw-r--r-- | tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro (renamed from tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp (renamed from tests/auto/particles/qsgmaskextruder/tst_qsgmaskextruder.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickparticlegroup/data/basic.qml (renamed from tests/auto/particles/qsgparticlegroup/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp (renamed from tests/auto/particles/qsgparticlegroup/tst_qsgparticlegroup.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickparticlesystem/data/basic.qml (renamed from tests/auto/particles/qsgparticlesystem/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp (renamed from tests/auto/particles/qsgparticlesystem/tst_qsgparticlesystem.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickpointattractor/data/basic.qml (renamed from tests/auto/particles/qsgpointattractor/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickpointattractor/qquickpointattractor.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp (renamed from tests/auto/particles/qsgpointattractor/tst_qsgpointattractor.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickpointdirection/data/basic.qml (renamed from tests/auto/particles/qsgpointdirection/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickpointdirection/qquickpointdirection.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp (renamed from tests/auto/particles/qsgpointdirection/tst_qsgpointdirection.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickrectangleextruder/data/basic.qml (renamed from tests/auto/particles/qsgrectangleextruder/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro (renamed from tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp (renamed from tests/auto/particles/qsgrectangleextruder/tst_qsgrectangleextruder.cpp) | 20 | ||||
-rw-r--r-- | tests/auto/particles/qquicktargetdirection/data/basic.qml (renamed from tests/auto/particles/qsgtargetdirection/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp (renamed from tests/auto/particles/qsgtargetdirection/tst_qsgtargetdirection.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquicktrailemitter/data/basic.qml (renamed from tests/auto/particles/qsgtrailemitter/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro (renamed from tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp (renamed from tests/auto/particles/qsgtrailemitter/tst_qsgtrailemitter.cpp) | 20 | ||||
-rw-r--r-- | tests/auto/particles/qquickturbulence/data/basic.qml (renamed from tests/auto/particles/qsgturbulence/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickturbulence/qquickturbulence.pro (renamed from tests/auto/particles/qsgimageparticle/qsgimageparticle.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp (renamed from tests/auto/particles/qsgturbulence/tst_qsgturbulence.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qquickwander/data/basic.qml (renamed from tests/auto/particles/qsgwander/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/particles/qquickwander/qquickwander.pro (renamed from tests/auto/particles/qsgfriction/qsgfriction.pro) | 4 | ||||
-rw-r--r-- | tests/auto/particles/qquickwander/tst_qquickwander.cpp (renamed from tests/auto/particles/qsgwander/tst_qsgwander.cpp) | 18 | ||||
-rw-r--r-- | tests/auto/particles/qsgitemparticle/qsgitemparticle.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsglineextruder/qsglineextruder.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgpointattractor/qsgpointattractor.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgpointdirection/qsgpointdirection.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro | 11 | ||||
-rw-r--r-- | tests/auto/particles/qsgwander/qsgwander.pro | 11 |
85 files changed, 384 insertions, 384 deletions
diff --git a/tests/auto/particles/particles.pro b/tests/auto/particles/particles.pro index 2c793a988e..d376b9305e 100644 --- a/tests/auto/particles/particles.pro +++ b/tests/auto/particles/particles.pro @@ -1,27 +1,27 @@ TEMPLATE = subdirs PRIVATETESTS += \ - qsgage \ - qsgangleddirection \ - qsgcumulativedirection \ - qsgcustomaffector \ - qsgcustomparticle \ - qsgellipseextruder \ - qsgfriction \ - qsggravity \ - qsgimageparticle \ - qsgitemparticle \ - qsglineextruder \ - qsgmaskextruder \ - qsgparticlegroup \ - qsgparticlesystem \ - qsgpointattractor \ - qsgpointdirection \ - qsgrectangleextruder \ - qsgtargetdirection \ - qsgtrailemitter \ - qsgturbulence \ - qsgwander + qquickage \ + qquickangleddirection \ + qquickcumulativedirection \ + qquickcustomaffector \ + qquickcustomparticle \ + qquickellipseextruder \ + qquickfriction \ + qquickgravity \ + qquickimageparticle \ + qquickitemparticle \ + qquicklineextruder \ + qquickmaskextruder \ + qquickparticlegroup \ + qquickparticlesystem \ + qquickpointattractor \ + qquickpointdirection \ + qquickrectangleextruder \ + qquicktargetdirection \ + qquicktrailemitter \ + qquickturbulence \ + qquickwander contains(QT_CONFIG, private_tests) { SUBDIRS += $$PRIVATETESTS diff --git a/tests/auto/particles/qsgage/data/jump.qml b/tests/auto/particles/qquickage/data/jump.qml index e66f9f4950..e66f9f4950 100644 --- a/tests/auto/particles/qsgage/data/jump.qml +++ b/tests/auto/particles/qquickage/data/jump.qml diff --git a/tests/auto/particles/qsgage/data/kill.qml b/tests/auto/particles/qquickage/data/kill.qml index 2558435e60..2558435e60 100644 --- a/tests/auto/particles/qsgage/data/kill.qml +++ b/tests/auto/particles/qquickage/data/kill.qml diff --git a/tests/auto/particles/qsgage/data/onceoff.qml b/tests/auto/particles/qquickage/data/onceoff.qml index 15d0e123b4..15d0e123b4 100644 --- a/tests/auto/particles/qsgage/data/onceoff.qml +++ b/tests/auto/particles/qquickage/data/onceoff.qml diff --git a/tests/auto/particles/qsgage/data/sustained.qml b/tests/auto/particles/qquickage/data/sustained.qml index 96aefec3dc..96aefec3dc 100644 --- a/tests/auto/particles/qsgage/data/sustained.qml +++ b/tests/auto/particles/qquickage/data/sustained.qml diff --git a/tests/auto/particles/qsgage/qsgage.pro b/tests/auto/particles/qquickage/qquickage.pro index e4904c8691..980d390953 100644 --- a/tests/auto/particles/qsgage/qsgage.pro +++ b/tests/auto/particles/qquickage/qquickage.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgage -SOURCES += tst_qsgage.cpp +TARGET = tst_qquickage +SOURCES += tst_qquickage.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsgage/tst_qsgage.cpp b/tests/auto/particles/qquickage/tst_qquickage.cpp index 7dc3e6ae60..73db409de3 100644 --- a/tests/auto/particles/qsgage/tst_qsgage.cpp +++ b/tests/auto/particles/qquickage/tst_qquickage.cpp @@ -41,14 +41,14 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgage : public QObject +class tst_qquickage : public QObject { Q_OBJECT public: - tst_qsgage(); + tst_qquickage(); private slots: void test_kill(); @@ -57,19 +57,19 @@ private slots: void test_sustained(); }; -tst_qsgage::tst_qsgage() +tst_qquickage::tst_qquickage() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgage::test_kill() +void tst_qquickage::test_kill() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/kill.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -86,14 +86,14 @@ void tst_qsgage::test_kill() } } -void tst_qsgage::test_jump() +void tst_qquickage::test_jump() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/jump.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -111,14 +111,14 @@ void tst_qsgage::test_jump() } } -void tst_qsgage::test_onceOff() +void tst_qquickage::test_onceOff() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/onceoff.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -135,15 +135,15 @@ void tst_qsgage::test_onceOff() } } -void tst_qsgage::test_sustained() +void tst_qquickage::test_sustained() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/sustained.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); //TODO: Ensure some particles have lived to 0.4s point despite unified timer QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -160,6 +160,6 @@ void tst_qsgage::test_sustained() } } -QTEST_MAIN(tst_qsgage); +QTEST_MAIN(tst_qquickage); -#include "tst_qsgage.moc" +#include "tst_qquickage.moc" diff --git a/tests/auto/particles/qsgangleddirection/data/basic.qml b/tests/auto/particles/qquickangleddirection/data/basic.qml index c2fda56561..c2fda56561 100644 --- a/tests/auto/particles/qsgangleddirection/data/basic.qml +++ b/tests/auto/particles/qquickangleddirection/data/basic.qml diff --git a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro new file mode 100644 index 0000000000..2a4ee5237a --- /dev/null +++ b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickangleddirection +SOURCES += tst_qquickangleddirection.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgangleddirection/tst_qsgangleddirection.cpp b/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp index 2957b9ee59..d21753e8a0 100644 --- a/tests/auto/particles/qsgangleddirection/tst_qsgangleddirection.cpp +++ b/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp @@ -42,32 +42,32 @@ #include <QtTest/QtTest> #include <qmath.h> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgangleddirection : public QObject +class tst_qquickangleddirection : public QObject { Q_OBJECT public: - tst_qsgangleddirection(); + tst_qquickangleddirection(); private slots: void test_basic(); }; -tst_qsgangleddirection::tst_qsgangleddirection() +tst_qquickangleddirection::tst_qquickangleddirection() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgangleddirection::test_basic() +void tst_qquickangleddirection::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -87,6 +87,6 @@ void tst_qsgangleddirection::test_basic() } } -QTEST_MAIN(tst_qsgangleddirection); +QTEST_MAIN(tst_qquickangleddirection); -#include "tst_qsgangleddirection.moc" +#include "tst_qquickangleddirection.moc" diff --git a/tests/auto/particles/qsgcumulativedirection/data/basic.qml b/tests/auto/particles/qquickcumulativedirection/data/basic.qml index bd46c4556f..bd46c4556f 100644 --- a/tests/auto/particles/qsgcumulativedirection/data/basic.qml +++ b/tests/auto/particles/qquickcumulativedirection/data/basic.qml diff --git a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro new file mode 100644 index 0000000000..160f63f3bc --- /dev/null +++ b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickcumulativedirection +SOURCES += tst_qquickcumulativedirection.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgcumulativedirection/tst_qsgcumulativedirection.cpp b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp index 0a21949aed..052578f3a8 100644 --- a/tests/auto/particles/qsgcumulativedirection/tst_qsgcumulativedirection.cpp +++ b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgcumulativedirection : public QObject +class tst_qquickcumulativedirection : public QObject { Q_OBJECT public: - tst_qsgcumulativedirection(); + tst_qquickcumulativedirection(); private slots: void test_basic(); }; -tst_qsgcumulativedirection::tst_qsgcumulativedirection() +tst_qquickcumulativedirection::tst_qquickcumulativedirection() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgcumulativedirection::test_basic() +void tst_qquickcumulativedirection::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -83,6 +83,6 @@ void tst_qsgcumulativedirection::test_basic() } } -QTEST_MAIN(tst_qsgcumulativedirection); +QTEST_MAIN(tst_qquickcumulativedirection); -#include "tst_qsgcumulativedirection.moc" +#include "tst_qquickcumulativedirection.moc" diff --git a/tests/auto/particles/qsgcustomaffector/data/basic.qml b/tests/auto/particles/qquickcustomaffector/data/basic.qml index 7371698026..7371698026 100644 --- a/tests/auto/particles/qsgcustomaffector/data/basic.qml +++ b/tests/auto/particles/qquickcustomaffector/data/basic.qml diff --git a/tests/auto/particles/qsgcustomaffector/data/move.qml b/tests/auto/particles/qquickcustomaffector/data/move.qml index f3d651c502..f3d651c502 100644 --- a/tests/auto/particles/qsgcustomaffector/data/move.qml +++ b/tests/auto/particles/qquickcustomaffector/data/move.qml diff --git a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro new file mode 100644 index 0000000000..e1293312b1 --- /dev/null +++ b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickcustomaffector +SOURCES += tst_qquickcustomaffector.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp index 91aa971eb7..77b1d09763 100644 --- a/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp +++ b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp @@ -41,33 +41,33 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgcustomaffector : public QObject +class tst_qquickcustomaffector : public QObject { Q_OBJECT public: - tst_qsgcustomaffector(); + tst_qquickcustomaffector(); private slots: void test_basic(); void test_move(); }; -tst_qsgcustomaffector::tst_qsgcustomaffector() +tst_qquickcustomaffector::tst_qquickcustomaffector() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgcustomaffector::test_basic() +void tst_qquickcustomaffector::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -84,14 +84,14 @@ void tst_qsgcustomaffector::test_basic() } } -void tst_qsgcustomaffector::test_move() +void tst_qquickcustomaffector::test_move() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/move.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused if (!d->stillAlive()) @@ -110,6 +110,6 @@ void tst_qsgcustomaffector::test_move() } } -QTEST_MAIN(tst_qsgcustomaffector); +QTEST_MAIN(tst_qquickcustomaffector); -#include "tst_qsgcustomaffector.moc" +#include "tst_qquickcustomaffector.moc" diff --git a/tests/auto/particles/qsgcustomparticle/data/basic.qml b/tests/auto/particles/qquickcustomparticle/data/basic.qml index 244f706b99..244f706b99 100644 --- a/tests/auto/particles/qsgcustomparticle/data/basic.qml +++ b/tests/auto/particles/qquickcustomparticle/data/basic.qml diff --git a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro new file mode 100644 index 0000000000..3476a66ca2 --- /dev/null +++ b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickcustomparticle +SOURCES += tst_qquickcustomparticle.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgcustomparticle/tst_qsgcustomparticle.cpp b/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp index 6fd02cd92b..3c73fad3f3 100644 --- a/tests/auto/particles/qsgcustomparticle/tst_qsgcustomparticle.cpp +++ b/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp @@ -41,34 +41,34 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgcustomparticle : public QObject +class tst_qquickcustomparticle : public QObject { Q_OBJECT public: - tst_qsgcustomparticle(); + tst_qquickcustomparticle(); private slots: void test_basic(); }; -tst_qsgcustomparticle::tst_qsgcustomparticle() +tst_qquickcustomparticle::tst_qquickcustomparticle() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgcustomparticle::test_basic() +void tst_qquickcustomparticle::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QVERIFY(view); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); bool oneNonZero = false; QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -89,6 +89,6 @@ void tst_qsgcustomparticle::test_basic() QVERIFY(oneNonZero);//Zero is a valid value, but it also needs to be set to a random number } -QTEST_MAIN(tst_qsgcustomparticle); +QTEST_MAIN(tst_qquickcustomparticle); -#include "tst_qsgcustomparticle.moc" +#include "tst_qquickcustomparticle.moc" diff --git a/tests/auto/particles/qsgellipseextruder/data/basic.qml b/tests/auto/particles/qquickellipseextruder/data/basic.qml index fa5fb3686a..fa5fb3686a 100644 --- a/tests/auto/particles/qsgellipseextruder/data/basic.qml +++ b/tests/auto/particles/qquickellipseextruder/data/basic.qml diff --git a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro new file mode 100644 index 0000000000..9f5147be33 --- /dev/null +++ b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickellipseextruder +SOURCES += tst_qquickellipseextruder.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgellipseextruder/tst_qsgellipseextruder.cpp b/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp index 92ee0c2623..7f412c8521 100644 --- a/tests/auto/particles/qsgellipseextruder/tst_qsgellipseextruder.cpp +++ b/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp @@ -42,14 +42,14 @@ #include <qmath.h> #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgellipseextruder : public QObject +class tst_qquickellipseextruder : public QObject { Q_OBJECT public: - tst_qsgellipseextruder(); + tst_qquickellipseextruder(); private slots: void test_basic(); @@ -57,12 +57,12 @@ private: bool inCircle(qreal x, qreal y, qreal r, bool borderOnly=false); }; -tst_qsgellipseextruder::tst_qsgellipseextruder() +tst_qquickellipseextruder::tst_qquickellipseextruder() { QUnifiedTimer::instance()->setConsistentTiming(true); } -bool tst_qsgellipseextruder::inCircle(qreal x, qreal y, qreal r, bool borderOnly) +bool tst_qquickellipseextruder::inCircle(qreal x, qreal y, qreal r, bool borderOnly) { x -= r; y -= r; @@ -75,15 +75,15 @@ bool tst_qsgellipseextruder::inCircle(qreal x, qreal y, qreal r, bool borderOnly return mag - EPSILON < r; } -void tst_qsgellipseextruder::test_basic() +void tst_qquickellipseextruder::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); //Filled QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -99,7 +99,7 @@ void tst_qsgellipseextruder::test_basic() } //Just border QCOMPARE(system->groupData[1]->size(), 500); - foreach (QSGParticleData *d, system->groupData[1]->data) { + foreach (QQuickParticleData *d, system->groupData[1]->data) { if (d->t == -1) continue; //Particle data unused @@ -115,6 +115,6 @@ void tst_qsgellipseextruder::test_basic() } } -QTEST_MAIN(tst_qsgellipseextruder); +QTEST_MAIN(tst_qquickellipseextruder); -#include "tst_qsgellipseextruder.moc" +#include "tst_qquickellipseextruder.moc" diff --git a/tests/auto/particles/qsgfriction/data/basic.qml b/tests/auto/particles/qquickfriction/data/basic.qml index 87a8897914..87a8897914 100644 --- a/tests/auto/particles/qsgfriction/data/basic.qml +++ b/tests/auto/particles/qquickfriction/data/basic.qml diff --git a/tests/auto/particles/qsgfriction/data/threshold.qml b/tests/auto/particles/qquickfriction/data/threshold.qml index 27990c3e7e..27990c3e7e 100644 --- a/tests/auto/particles/qsgfriction/data/threshold.qml +++ b/tests/auto/particles/qquickfriction/data/threshold.qml diff --git a/tests/auto/particles/qsgturbulence/qsgturbulence.pro b/tests/auto/particles/qquickfriction/qquickfriction.pro index 702c1d11a5..d6726724ff 100644 --- a/tests/auto/particles/qsgturbulence/qsgturbulence.pro +++ b/tests/auto/particles/qquickfriction/qquickfriction.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgturbulence -SOURCES += tst_qsgturbulence.cpp +TARGET = tst_qquickfriction +SOURCES += tst_qquickfriction.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsgfriction/tst_qsgfriction.cpp b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp index 3237c92421..aca4ea2330 100644 --- a/tests/auto/particles/qsgfriction/tst_qsgfriction.cpp +++ b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp @@ -41,34 +41,34 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgfriction : public QObject +class tst_qquickfriction : public QObject { Q_OBJECT public: - tst_qsgfriction(); + tst_qquickfriction(); private slots: void test_basic(); void test_threshold(); }; -tst_qsgfriction::tst_qsgfriction() +tst_qquickfriction::tst_qquickfriction() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgfriction::test_basic() +void tst_qquickfriction::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); //Default is just slowed a little QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -85,7 +85,7 @@ void tst_qsgfriction::test_basic() //Nondefault comes to a complete stop within the first half of its life QCOMPARE(system->groupData[1]->size(), 500); - foreach (QSGParticleData *d, system->groupData[1]->data) { + foreach (QQuickParticleData *d, system->groupData[1]->data) { if (d->t == -1) continue; //Particle data unused @@ -103,15 +103,15 @@ void tst_qsgfriction::test_basic() } } -void tst_qsgfriction::test_threshold() +void tst_qquickfriction::test_threshold() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/threshold.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); //Speed capped at 50, but it might take a frame or two to get there QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1.0f) continue; //Particle data unused if (myFuzzyGEQ(d->t, ((qreal)system->timeInt/1000.0) - 0.1)) @@ -129,6 +129,6 @@ void tst_qsgfriction::test_threshold() } } -QTEST_MAIN(tst_qsgfriction); +QTEST_MAIN(tst_qquickfriction); -#include "tst_qsgfriction.moc" +#include "tst_qquickfriction.moc" diff --git a/tests/auto/particles/qsggravity/data/basic.qml b/tests/auto/particles/qquickgravity/data/basic.qml index 9275654297..9275654297 100644 --- a/tests/auto/particles/qsggravity/data/basic.qml +++ b/tests/auto/particles/qquickgravity/data/basic.qml diff --git a/tests/auto/particles/qsggravity/qsggravity.pro b/tests/auto/particles/qquickgravity/qquickgravity.pro index a6e345146f..bc503d932a 100644 --- a/tests/auto/particles/qsggravity/qsggravity.pro +++ b/tests/auto/particles/qquickgravity/qquickgravity.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsggravity -SOURCES += tst_qsggravity.cpp +TARGET = tst_qquickgravity +SOURCES += tst_qquickgravity.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsggravity/tst_qsggravity.cpp b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp index ae82384540..5613591171 100644 --- a/tests/auto/particles/qsggravity/tst_qsggravity.cpp +++ b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsggravity : public QObject +class tst_qquickgravity : public QObject { Q_OBJECT public: - tst_qsggravity(); + tst_qquickgravity(); private slots: void test_basic(); }; -tst_qsggravity::tst_qsggravity() +tst_qquickgravity::tst_qquickgravity() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsggravity::test_basic() +void tst_qquickgravity::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -79,6 +79,6 @@ void tst_qsggravity::test_basic() } } -QTEST_MAIN(tst_qsggravity); +QTEST_MAIN(tst_qquickgravity); -#include "tst_qsggravity.moc" +#include "tst_qquickgravity.moc" diff --git a/tests/auto/particles/qsgimageparticle/data/basic.qml b/tests/auto/particles/qquickimageparticle/data/basic.qml index f5ef4c16c0..f5ef4c16c0 100644 --- a/tests/auto/particles/qsgimageparticle/data/basic.qml +++ b/tests/auto/particles/qquickimageparticle/data/basic.qml diff --git a/tests/auto/particles/qsgimageparticle/data/colored.qml b/tests/auto/particles/qquickimageparticle/data/colored.qml index 8f4ddbf8c4..8f4ddbf8c4 100644 --- a/tests/auto/particles/qsgimageparticle/data/colored.qml +++ b/tests/auto/particles/qquickimageparticle/data/colored.qml diff --git a/tests/auto/particles/qsgimageparticle/data/deformed.qml b/tests/auto/particles/qquickimageparticle/data/deformed.qml index b0a58ee5d1..b0a58ee5d1 100644 --- a/tests/auto/particles/qsgimageparticle/data/deformed.qml +++ b/tests/auto/particles/qquickimageparticle/data/deformed.qml diff --git a/tests/auto/particles/qsgimageparticle/data/sprite.qml b/tests/auto/particles/qquickimageparticle/data/sprite.qml index 5c1acf4b04..5c1acf4b04 100644 --- a/tests/auto/particles/qsgimageparticle/data/sprite.qml +++ b/tests/auto/particles/qquickimageparticle/data/sprite.qml diff --git a/tests/auto/particles/qsgimageparticle/data/tabled.qml b/tests/auto/particles/qquickimageparticle/data/tabled.qml index 8a7a9ce229..8a7a9ce229 100644 --- a/tests/auto/particles/qsgimageparticle/data/tabled.qml +++ b/tests/auto/particles/qquickimageparticle/data/tabled.qml diff --git a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro new file mode 100644 index 0000000000..c05ecdfb09 --- /dev/null +++ b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickimageparticle +SOURCES += tst_qquickimageparticle.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgimageparticle/tst_qsgimageparticle.cpp b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp index cd0378392c..e56de35137 100644 --- a/tests/auto/particles/qsgimageparticle/tst_qsgimageparticle.cpp +++ b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp @@ -41,16 +41,16 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> const double CONV_FACTOR = 0.017453292519943295;//Degrees to radians -class tst_qsgimageparticle : public QObject +class tst_qquickimageparticle : public QObject { Q_OBJECT public: - tst_qsgimageparticle(); + tst_qquickimageparticle(); private slots: void test_basic(); @@ -60,19 +60,19 @@ private slots: void test_sprite(); }; -tst_qsgimageparticle::tst_qsgimageparticle() +tst_qquickimageparticle::tst_qquickimageparticle() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgimageparticle::test_basic() +void tst_qquickimageparticle::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -108,14 +108,14 @@ void tst_qsgimageparticle::test_basic() } -void tst_qsgimageparticle::test_colored() +void tst_qquickimageparticle::test_colored() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/colored.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -151,14 +151,14 @@ void tst_qsgimageparticle::test_colored() } -void tst_qsgimageparticle::test_deformed() +void tst_qquickimageparticle::test_deformed() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/deformed.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -194,14 +194,14 @@ void tst_qsgimageparticle::test_deformed() } -void tst_qsgimageparticle::test_tabled() +void tst_qquickimageparticle::test_tabled() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/tabled.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -238,14 +238,14 @@ void tst_qsgimageparticle::test_tabled() } -void tst_qsgimageparticle::test_sprite() +void tst_qquickimageparticle::test_sprite() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/sprite.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -280,6 +280,6 @@ void tst_qsgimageparticle::test_sprite() } } -QTEST_MAIN(tst_qsgimageparticle); +QTEST_MAIN(tst_qquickimageparticle); -#include "tst_qsgimageparticle.moc" +#include "tst_qquickimageparticle.moc" diff --git a/tests/auto/particles/qsgitemparticle/data/basic.qml b/tests/auto/particles/qquickitemparticle/data/basic.qml index dbe16a0b4e..dbe16a0b4e 100644 --- a/tests/auto/particles/qsgitemparticle/data/basic.qml +++ b/tests/auto/particles/qquickitemparticle/data/basic.qml diff --git a/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro index 297bba9952..dc006d2ba1 100644 --- a/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro +++ b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgellipseextruder -SOURCES += tst_qsgellipseextruder.cpp +TARGET = tst_qquickitemparticle +SOURCES += tst_qquickitemparticle.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsgitemparticle/tst_qsgitemparticle.cpp b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp index 07ae377f0f..40197ec619 100644 --- a/tests/auto/particles/qsgitemparticle/tst_qsgitemparticle.cpp +++ b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp @@ -41,33 +41,33 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qquickimage_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgitemparticle : public QObject +class tst_qquickitemparticle : public QObject { Q_OBJECT public: - tst_qsgitemparticle(); + tst_qquickitemparticle(); private slots: void test_basic(); }; -tst_qsgitemparticle::tst_qsgitemparticle() +tst_qquickitemparticle::tst_qquickitemparticle() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgitemparticle::test_basic() +void tst_qquickitemparticle::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -90,6 +90,6 @@ void tst_qsgitemparticle::test_basic() } } -QTEST_MAIN(tst_qsgitemparticle); +QTEST_MAIN(tst_qquickitemparticle); -#include "tst_qsgitemparticle.moc" +#include "tst_qquickitemparticle.moc" diff --git a/tests/auto/particles/qsglineextruder/data/basic.qml b/tests/auto/particles/qquicklineextruder/data/basic.qml index dbe2ec5c7d..dbe2ec5c7d 100644 --- a/tests/auto/particles/qsglineextruder/data/basic.qml +++ b/tests/auto/particles/qquicklineextruder/data/basic.qml diff --git a/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro index e8e1e5b9a5..255c9a4104 100644 --- a/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro +++ b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgangleddirection -SOURCES += tst_qsgangleddirection.cpp +TARGET = tst_qquicklineextruder +SOURCES += tst_qquicklineextruder.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsglineextruder/tst_qsglineextruder.cpp b/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp index b66c174211..ff45a9e92c 100644 --- a/tests/auto/particles/qsglineextruder/tst_qsglineextruder.cpp +++ b/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsglineextruder : public QObject +class tst_qquicklineextruder : public QObject { Q_OBJECT public: - tst_qsglineextruder(); + tst_qquicklineextruder(); private slots: void test_basic(); }; -tst_qsglineextruder::tst_qsglineextruder() +tst_qquicklineextruder::tst_qquicklineextruder() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsglineextruder::test_basic() +void tst_qquicklineextruder::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -82,7 +82,7 @@ void tst_qsglineextruder::test_basic() } QCOMPARE(system->groupData[1]->size(), 500); - foreach (QSGParticleData *d, system->groupData[1]->data) { + foreach (QQuickParticleData *d, system->groupData[1]->data) { if (d->t == -1) continue; //Particle data unused @@ -98,6 +98,6 @@ void tst_qsglineextruder::test_basic() } } -QTEST_MAIN(tst_qsglineextruder); +QTEST_MAIN(tst_qquicklineextruder); -#include "tst_qsglineextruder.moc" +#include "tst_qquicklineextruder.moc" diff --git a/tests/auto/particles/qsgmaskextruder/data/basic.qml b/tests/auto/particles/qquickmaskextruder/data/basic.qml index 804df83de8..804df83de8 100644 --- a/tests/auto/particles/qsgmaskextruder/data/basic.qml +++ b/tests/auto/particles/qquickmaskextruder/data/basic.qml diff --git a/tests/auto/particles/qsgmaskextruder/data/smallmask.png b/tests/auto/particles/qquickmaskextruder/data/smallmask.png Binary files differindex e36fb9fe55..e36fb9fe55 100644 --- a/tests/auto/particles/qsgmaskextruder/data/smallmask.png +++ b/tests/auto/particles/qquickmaskextruder/data/smallmask.png diff --git a/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro index 2f84d78c08..b53d3610fa 100644 --- a/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro +++ b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgcustomparticle -SOURCES += tst_qsgcustomparticle.cpp +TARGET = tst_qquickmaskextruder +SOURCES += tst_qquickmaskextruder.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsgmaskextruder/tst_qsgmaskextruder.cpp b/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp index 962ab27508..b2a178fa1c 100644 --- a/tests/auto/particles/qsgmaskextruder/tst_qsgmaskextruder.cpp +++ b/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgmaskextruder : public QObject +class tst_qquickmaskextruder : public QObject { Q_OBJECT public: - tst_qsgmaskextruder(); + tst_qquickmaskextruder(); private slots: void test_basic(); }; -tst_qsgmaskextruder::tst_qsgmaskextruder() +tst_qquickmaskextruder::tst_qquickmaskextruder() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgmaskextruder::test_basic() +void tst_qquickmaskextruder::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -83,6 +83,6 @@ void tst_qsgmaskextruder::test_basic() } } -QTEST_MAIN(tst_qsgmaskextruder); +QTEST_MAIN(tst_qquickmaskextruder); -#include "tst_qsgmaskextruder.moc" +#include "tst_qquickmaskextruder.moc" diff --git a/tests/auto/particles/qsgparticlegroup/data/basic.qml b/tests/auto/particles/qquickparticlegroup/data/basic.qml index 97dadd7461..97dadd7461 100644 --- a/tests/auto/particles/qsgparticlegroup/data/basic.qml +++ b/tests/auto/particles/qquickparticlegroup/data/basic.qml diff --git a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro new file mode 100644 index 0000000000..b100ffaf75 --- /dev/null +++ b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickparticlegroup +SOURCES += tst_qquickparticlegroup.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgparticlegroup/tst_qsgparticlegroup.cpp b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp index f49f3c444d..c3b155aa68 100644 --- a/tests/auto/particles/qsgparticlegroup/tst_qsgparticlegroup.cpp +++ b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp @@ -41,33 +41,33 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgparticlegroup : public QObject +class tst_qquickparticlegroup : public QObject { Q_OBJECT public: - tst_qsgparticlegroup(); + tst_qquickparticlegroup(); private slots: void test_instantTransition(); }; -tst_qsgparticlegroup::tst_qsgparticlegroup() +tst_qquickparticlegroup::tst_qquickparticlegroup() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgparticlegroup::test_instantTransition() +void tst_qquickparticlegroup::test_instantTransition() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); //A frame or two worth of particles will be missed, the transition doesn't take effect on the frame it's spawned (QTBUG-21781) QVERIFY(system->groupData[0]->size() <= 500 && system->groupData[0]->size() >= 450); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -84,6 +84,6 @@ void tst_qsgparticlegroup::test_instantTransition() } } -QTEST_MAIN(tst_qsgparticlegroup); +QTEST_MAIN(tst_qquickparticlegroup); -#include "tst_qsgparticlegroup.moc" +#include "tst_qquickparticlegroup.moc" diff --git a/tests/auto/particles/qsgparticlesystem/data/basic.qml b/tests/auto/particles/qquickparticlesystem/data/basic.qml index f5ef4c16c0..f5ef4c16c0 100644 --- a/tests/auto/particles/qsgparticlesystem/data/basic.qml +++ b/tests/auto/particles/qquickparticlesystem/data/basic.qml diff --git a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro new file mode 100644 index 0000000000..65472e23f9 --- /dev/null +++ b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickparticlesystem +SOURCES += tst_qquickparticlesystem.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgparticlesystem/tst_qsgparticlesystem.cpp b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp index 06a2414e95..b85c57da0b 100644 --- a/tests/auto/particles/qsgparticlesystem/tst_qsgparticlesystem.cpp +++ b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp @@ -41,33 +41,33 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgparticlesystem : public QObject +class tst_qquickparticlesystem : public QObject { Q_OBJECT public: - tst_qsgparticlesystem(); + tst_qquickparticlesystem(); private slots: void test_basic(); }; -tst_qsgparticlesystem::tst_qsgparticlesystem() +tst_qquickparticlesystem::tst_qquickparticlesystem() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgparticlesystem::test_basic() +void tst_qquickparticlesystem::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); int stillAlive = 0; - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -87,6 +87,6 @@ void tst_qsgparticlesystem::test_basic() QVERIFY(extremelyFuzzyCompare(stillAlive, 500, 5));//Small simulation variance is permissible. } -QTEST_MAIN(tst_qsgparticlesystem); +QTEST_MAIN(tst_qquickparticlesystem); -#include "tst_qsgparticlesystem.moc" +#include "tst_qquickparticlesystem.moc" diff --git a/tests/auto/particles/qsgpointattractor/data/basic.qml b/tests/auto/particles/qquickpointattractor/data/basic.qml index 86861a9cf2..86861a9cf2 100644 --- a/tests/auto/particles/qsgpointattractor/data/basic.qml +++ b/tests/auto/particles/qquickpointattractor/data/basic.qml diff --git a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro new file mode 100644 index 0000000000..13b512791a --- /dev/null +++ b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickpointattractor +SOURCES += tst_qquickpointattractor.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgpointattractor/tst_qsgpointattractor.cpp b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp index 14207f9fd6..6a64f919c0 100644 --- a/tests/auto/particles/qsgpointattractor/tst_qsgpointattractor.cpp +++ b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgpointattractor : public QObject +class tst_qquickpointattractor : public QObject { Q_OBJECT public: - tst_qsgpointattractor(); + tst_qquickpointattractor(); private slots: void test_basic(); }; -tst_qsgpointattractor::tst_qsgpointattractor() +tst_qquickpointattractor::tst_qquickpointattractor() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgpointattractor::test_basic() +void tst_qquickpointattractor::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -84,6 +84,6 @@ void tst_qsgpointattractor::test_basic() } } -QTEST_MAIN(tst_qsgpointattractor); +QTEST_MAIN(tst_qquickpointattractor); -#include "tst_qsgpointattractor.moc" +#include "tst_qquickpointattractor.moc" diff --git a/tests/auto/particles/qsgpointdirection/data/basic.qml b/tests/auto/particles/qquickpointdirection/data/basic.qml index 60c2a3e37b..60c2a3e37b 100644 --- a/tests/auto/particles/qsgpointdirection/data/basic.qml +++ b/tests/auto/particles/qquickpointdirection/data/basic.qml diff --git a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro new file mode 100644 index 0000000000..6adab3d75d --- /dev/null +++ b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquickpointdirection +SOURCES += tst_qquickpointdirection.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgpointdirection/tst_qsgpointdirection.cpp b/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp index b9b3dc15cb..19cc471126 100644 --- a/tests/auto/particles/qsgpointdirection/tst_qsgpointdirection.cpp +++ b/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgpointdirection : public QObject +class tst_qquickpointdirection : public QObject { Q_OBJECT public: - tst_qsgpointdirection(); + tst_qquickpointdirection(); private slots: void test_basic(); }; -tst_qsgpointdirection::tst_qsgpointdirection() +tst_qquickpointdirection::tst_qquickpointdirection() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgpointdirection::test_basic() +void tst_qquickpointdirection::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -85,6 +85,6 @@ void tst_qsgpointdirection::test_basic() } } -QTEST_MAIN(tst_qsgpointdirection); +QTEST_MAIN(tst_qquickpointdirection); -#include "tst_qsgpointdirection.moc" +#include "tst_qquickpointdirection.moc" diff --git a/tests/auto/particles/qsgrectangleextruder/data/basic.qml b/tests/auto/particles/qquickrectangleextruder/data/basic.qml index a66827ed90..a66827ed90 100644 --- a/tests/auto/particles/qsgrectangleextruder/data/basic.qml +++ b/tests/auto/particles/qquickrectangleextruder/data/basic.qml diff --git a/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro index 75933c679f..fee29efcf3 100644 --- a/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro +++ b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgcumulativedirection -SOURCES += tst_qsgcumulativedirection.cpp +TARGET = tst_qquickrectangleextruder +SOURCES += tst_qquickrectangleextruder.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsgrectangleextruder/tst_qsgrectangleextruder.cpp b/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp index dd86713b5b..6fb2e9cae8 100644 --- a/tests/auto/particles/qsgrectangleextruder/tst_qsgrectangleextruder.cpp +++ b/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgrectangleextruder : public QObject +class tst_qquickrectangleextruder : public QObject { Q_OBJECT public: - tst_qsgrectangleextruder(); + tst_qquickrectangleextruder(); private slots: void test_basic(); }; -tst_qsgrectangleextruder::tst_qsgrectangleextruder() +tst_qquickrectangleextruder::tst_qquickrectangleextruder() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgrectangleextruder::test_basic() +void tst_qquickrectangleextruder::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -85,7 +85,7 @@ void tst_qsgrectangleextruder::test_basic() } QCOMPARE(system->groupData[1]->size(), 500); - foreach (QSGParticleData *d, system->groupData[1]->data) { + foreach (QQuickParticleData *d, system->groupData[1]->data) { if (d->t == -1) continue; //Particle data unused @@ -108,6 +108,6 @@ void tst_qsgrectangleextruder::test_basic() } } -QTEST_MAIN(tst_qsgrectangleextruder); +QTEST_MAIN(tst_qquickrectangleextruder); -#include "tst_qsgrectangleextruder.moc" +#include "tst_qquickrectangleextruder.moc" diff --git a/tests/auto/particles/qsgtargetdirection/data/basic.qml b/tests/auto/particles/qquicktargetdirection/data/basic.qml index a8caea4641..a8caea4641 100644 --- a/tests/auto/particles/qsgtargetdirection/data/basic.qml +++ b/tests/auto/particles/qquicktargetdirection/data/basic.qml diff --git a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro new file mode 100644 index 0000000000..0de6007283 --- /dev/null +++ b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro @@ -0,0 +1,11 @@ +CONFIG += testcase +TARGET = tst_qquicktargetdirection +SOURCES += tst_qquicktargetdirection.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib + diff --git a/tests/auto/particles/qsgtargetdirection/tst_qsgtargetdirection.cpp b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp index 5637c4c473..7d83ae8830 100644 --- a/tests/auto/particles/qsgtargetdirection/tst_qsgtargetdirection.cpp +++ b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgtargetdirection : public QObject +class tst_qquicktargetdirection : public QObject { Q_OBJECT public: - tst_qsgtargetdirection(); + tst_qquicktargetdirection(); private slots: void test_basic(); }; -tst_qsgtargetdirection::tst_qsgtargetdirection() +tst_qquicktargetdirection::tst_qquicktargetdirection() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgtargetdirection::test_basic() +void tst_qquicktargetdirection::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -83,6 +83,6 @@ void tst_qsgtargetdirection::test_basic() } } -QTEST_MAIN(tst_qsgtargetdirection); +QTEST_MAIN(tst_qquicktargetdirection); -#include "tst_qsgtargetdirection.moc" +#include "tst_qquicktargetdirection.moc" diff --git a/tests/auto/particles/qsgtrailemitter/data/basic.qml b/tests/auto/particles/qquicktrailemitter/data/basic.qml index 538d14f1d5..538d14f1d5 100644 --- a/tests/auto/particles/qsgtrailemitter/data/basic.qml +++ b/tests/auto/particles/qquicktrailemitter/data/basic.qml diff --git a/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro index 6ce702aa12..7b8075d625 100644 --- a/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro +++ b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgcustomaffector -SOURCES += tst_qsgcustomaffector.cpp +TARGET = tst_qquicktrailemitter +SOURCES += tst_qquicktrailemitter.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsgtrailemitter/tst_qsgtrailemitter.cpp b/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp index 19a63fb73d..6325ca6efe 100644 --- a/tests/auto/particles/qsgtrailemitter/tst_qsgtrailemitter.cpp +++ b/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp @@ -41,32 +41,32 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgtrailemitter : public QObject +class tst_qquicktrailemitter : public QObject { Q_OBJECT public: - tst_qsgtrailemitter(); + tst_qquicktrailemitter(); private slots: void test_basic(); }; -tst_qsgtrailemitter::tst_qsgtrailemitter() +tst_qquicktrailemitter::tst_qquicktrailemitter() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgtrailemitter::test_basic() +void tst_qquicktrailemitter::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -83,7 +83,7 @@ void tst_qsgtrailemitter::test_basic() } QCOMPARE(system->groupData[1]->size(), 500); - foreach (QSGParticleData *d, system->groupData[1]->data) { + foreach (QQuickParticleData *d, system->groupData[1]->data) { if (d->t == -1) continue; //Particle data unused @@ -100,6 +100,6 @@ void tst_qsgtrailemitter::test_basic() } } -QTEST_MAIN(tst_qsgtrailemitter); +QTEST_MAIN(tst_qquicktrailemitter); -#include "tst_qsgtrailemitter.moc" +#include "tst_qquicktrailemitter.moc" diff --git a/tests/auto/particles/qsgturbulence/data/basic.qml b/tests/auto/particles/qquickturbulence/data/basic.qml index 42b5cd6a97..42b5cd6a97 100644 --- a/tests/auto/particles/qsgturbulence/data/basic.qml +++ b/tests/auto/particles/qquickturbulence/data/basic.qml diff --git a/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro b/tests/auto/particles/qquickturbulence/qquickturbulence.pro index 62dbd0b817..405e8a6f2a 100644 --- a/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro +++ b/tests/auto/particles/qquickturbulence/qquickturbulence.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgimageparticle -SOURCES += tst_qsgimageparticle.cpp +TARGET = tst_qquickturbulence +SOURCES += tst_qquickturbulence.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsgturbulence/tst_qsgturbulence.cpp b/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp index ca8a797b78..29faec2381 100644 --- a/tests/auto/particles/qsgturbulence/tst_qsgturbulence.cpp +++ b/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp @@ -41,34 +41,34 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgturbulence : public QObject +class tst_qquickturbulence : public QObject { Q_OBJECT public: - tst_qsgturbulence(); + tst_qquickturbulence(); private slots: void test_basic(); }; -tst_qsgturbulence::tst_qsgturbulence() +tst_qquickturbulence::tst_qquickturbulence() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgturbulence::test_basic() +void tst_qquickturbulence::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); //Note that the noise image built-in provides the 'randomness', so this test should be stable so long as it and the size //of the Turbulence item remain the same QCOMPARE(system->groupData[0]->size(), 500); - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -81,6 +81,6 @@ void tst_qsgturbulence::test_basic() } } -QTEST_MAIN(tst_qsgturbulence); +QTEST_MAIN(tst_qquickturbulence); -#include "tst_qsgturbulence.moc" +#include "tst_qquickturbulence.moc" diff --git a/tests/auto/particles/qsgwander/data/basic.qml b/tests/auto/particles/qquickwander/data/basic.qml index ebb4bd963a..ebb4bd963a 100644 --- a/tests/auto/particles/qsgwander/data/basic.qml +++ b/tests/auto/particles/qquickwander/data/basic.qml diff --git a/tests/auto/particles/qsgfriction/qsgfriction.pro b/tests/auto/particles/qquickwander/qquickwander.pro index ad3f054957..cf6f08e2dc 100644 --- a/tests/auto/particles/qsgfriction/qsgfriction.pro +++ b/tests/auto/particles/qquickwander/qquickwander.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_qsgfriction -SOURCES += tst_qsgfriction.cpp +TARGET = tst_qquickwander +SOURCES += tst_qquickwander.cpp macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/particles/qsgwander/tst_qsgwander.cpp b/tests/auto/particles/qquickwander/tst_qquickwander.cpp index 56ae15e7bb..41f09d4993 100644 --- a/tests/auto/particles/qsgwander/tst_qsgwander.cpp +++ b/tests/auto/particles/qquickwander/tst_qquickwander.cpp @@ -41,28 +41,28 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" -#include <private/qsgparticlesystem_p.h> +#include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qsgwander : public QObject +class tst_qquickwander : public QObject { Q_OBJECT public: - tst_qsgwander(); + tst_qquickwander(); private slots: void test_basic(); }; -tst_qsgwander::tst_qsgwander() +tst_qquickwander::tst_qquickwander() { QUnifiedTimer::instance()->setConsistentTiming(true); } -void tst_qsgwander::test_basic() +void tst_qquickwander::test_basic() { QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); - QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); QCOMPARE(system->groupData[0]->size(), 500); @@ -70,7 +70,7 @@ void tst_qsgwander::test_basic() //the 500 was randomly changed from 0.0 in velocity bool vxChanged = false; bool vyChanged = false; - foreach (QSGParticleData *d, system->groupData[0]->data) { + foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused @@ -89,6 +89,6 @@ void tst_qsgwander::test_basic() QVERIFY(vyChanged); } -QTEST_MAIN(tst_qsgwander); +QTEST_MAIN(tst_qquickwander); -#include "tst_qsgwander.moc" +#include "tst_qquickwander.moc" diff --git a/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro b/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro deleted file mode 100644 index afecb905db..0000000000 --- a/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgitemparticle -SOURCES += tst_qsgitemparticle.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsglineextruder/qsglineextruder.pro b/tests/auto/particles/qsglineextruder/qsglineextruder.pro deleted file mode 100644 index 90e28fc2ae..0000000000 --- a/tests/auto/particles/qsglineextruder/qsglineextruder.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsglineextruder -SOURCES += tst_qsglineextruder.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro b/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro deleted file mode 100644 index 995adabc7b..0000000000 --- a/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgmaskextruder -SOURCES += tst_qsgmaskextruder.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro b/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro deleted file mode 100644 index 3d71ee0289..0000000000 --- a/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgparticlegroup -SOURCES += tst_qsgparticlegroup.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro b/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro deleted file mode 100644 index 6236a20bb6..0000000000 --- a/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgparticlesystem -SOURCES += tst_qsgparticlesystem.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro b/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro deleted file mode 100644 index 865d58c89d..0000000000 --- a/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgpointattractor -SOURCES += tst_qsgpointattractor.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro b/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro deleted file mode 100644 index 841464d48e..0000000000 --- a/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgpointdirection -SOURCES += tst_qsgpointdirection.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro b/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro deleted file mode 100644 index e0e8f51aaa..0000000000 --- a/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgrectangleextruder -SOURCES += tst_qsgrectangleextruder.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro b/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro deleted file mode 100644 index 77288f7bc1..0000000000 --- a/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgtargetdirection -SOURCES += tst_qsgtargetdirection.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro b/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro deleted file mode 100644 index b7cb766877..0000000000 --- a/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgtrailemitter -SOURCES += tst_qsgtrailemitter.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - diff --git a/tests/auto/particles/qsgwander/qsgwander.pro b/tests/auto/particles/qsgwander/qsgwander.pro deleted file mode 100644 index e11a522885..0000000000 --- a/tests/auto/particles/qsgwander/qsgwander.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsgwander -SOURCES += tst_qsgwander.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private testlib - |