diff options
Diffstat (limited to 'tests/auto/particles')
22 files changed, 34 insertions, 34 deletions
diff --git a/tests/auto/particles/qsgage/tst_qsgage.cpp b/tests/auto/particles/qsgage/tst_qsgage.cpp index faa267560b..7dc3e6ae60 100644 --- a/tests/auto/particles/qsgage/tst_qsgage.cpp +++ b/tests/auto/particles/qsgage/tst_qsgage.cpp @@ -64,7 +64,7 @@ tst_qsgage::tst_qsgage() void tst_qsgage::test_kill() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/kill.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/kill.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -88,7 +88,7 @@ void tst_qsgage::test_kill() void tst_qsgage::test_jump() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/jump.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/jump.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -113,7 +113,7 @@ void tst_qsgage::test_jump() void tst_qsgage::test_onceOff() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/onceoff.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/onceoff.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -137,7 +137,7 @@ void tst_qsgage::test_onceOff() void tst_qsgage::test_sustained() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/sustained.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/sustained.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); //TODO: Ensure some particles have lived to 0.4s point despite unified timer diff --git a/tests/auto/particles/qsgangleddirection/tst_qsgangleddirection.cpp b/tests/auto/particles/qsgangleddirection/tst_qsgangleddirection.cpp index dbb23ff29e..2957b9ee59 100644 --- a/tests/auto/particles/qsgangleddirection/tst_qsgangleddirection.cpp +++ b/tests/auto/particles/qsgangleddirection/tst_qsgangleddirection.cpp @@ -62,7 +62,7 @@ tst_qsgangleddirection::tst_qsgangleddirection() void tst_qsgangleddirection::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgcumulativedirection/tst_qsgcumulativedirection.cpp b/tests/auto/particles/qsgcumulativedirection/tst_qsgcumulativedirection.cpp index 00efff54bf..0a21949aed 100644 --- a/tests/auto/particles/qsgcumulativedirection/tst_qsgcumulativedirection.cpp +++ b/tests/auto/particles/qsgcumulativedirection/tst_qsgcumulativedirection.cpp @@ -61,7 +61,7 @@ tst_qsgcumulativedirection::tst_qsgcumulativedirection() void tst_qsgcumulativedirection::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp b/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp index 2b36d318c5..d49f6cb908 100644 --- a/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp +++ b/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp @@ -61,7 +61,7 @@ tst_qsgcustomaffector::tst_qsgcustomaffector() void tst_qsgcustomaffector::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgcustomparticle/tst_qsgcustomparticle.cpp b/tests/auto/particles/qsgcustomparticle/tst_qsgcustomparticle.cpp index 92762ea8e2..6fd02cd92b 100644 --- a/tests/auto/particles/qsgcustomparticle/tst_qsgcustomparticle.cpp +++ b/tests/auto/particles/qsgcustomparticle/tst_qsgcustomparticle.cpp @@ -61,7 +61,7 @@ tst_qsgcustomparticle::tst_qsgcustomparticle() void tst_qsgcustomparticle::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QVERIFY(view); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgellipseextruder/tst_qsgellipseextruder.cpp b/tests/auto/particles/qsgellipseextruder/tst_qsgellipseextruder.cpp index 040a5e98b5..92ee0c2623 100644 --- a/tests/auto/particles/qsgellipseextruder/tst_qsgellipseextruder.cpp +++ b/tests/auto/particles/qsgellipseextruder/tst_qsgellipseextruder.cpp @@ -77,7 +77,7 @@ bool tst_qsgellipseextruder::inCircle(qreal x, qreal y, qreal r, bool borderOnly void tst_qsgellipseextruder::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgfriction/tst_qsgfriction.cpp b/tests/auto/particles/qsgfriction/tst_qsgfriction.cpp index bc622e4648..ad37c3ef38 100644 --- a/tests/auto/particles/qsgfriction/tst_qsgfriction.cpp +++ b/tests/auto/particles/qsgfriction/tst_qsgfriction.cpp @@ -61,7 +61,7 @@ tst_qsgfriction::tst_qsgfriction() void tst_qsgfriction::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsggravity/tst_qsggravity.cpp b/tests/auto/particles/qsggravity/tst_qsggravity.cpp index 475809446c..ae82384540 100644 --- a/tests/auto/particles/qsggravity/tst_qsggravity.cpp +++ b/tests/auto/particles/qsggravity/tst_qsggravity.cpp @@ -61,7 +61,7 @@ tst_qsggravity::tst_qsggravity() void tst_qsggravity::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgimageparticle/tst_qsgimageparticle.cpp b/tests/auto/particles/qsgimageparticle/tst_qsgimageparticle.cpp index a416271669..cd0378392c 100644 --- a/tests/auto/particles/qsgimageparticle/tst_qsgimageparticle.cpp +++ b/tests/auto/particles/qsgimageparticle/tst_qsgimageparticle.cpp @@ -67,7 +67,7 @@ tst_qsgimageparticle::tst_qsgimageparticle() void tst_qsgimageparticle::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -110,7 +110,7 @@ void tst_qsgimageparticle::test_basic() void tst_qsgimageparticle::test_colored() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/colored.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/colored.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -153,7 +153,7 @@ void tst_qsgimageparticle::test_colored() void tst_qsgimageparticle::test_deformed() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/deformed.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/deformed.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -196,7 +196,7 @@ void tst_qsgimageparticle::test_deformed() void tst_qsgimageparticle::test_tabled() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/tabled.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/tabled.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -240,7 +240,7 @@ void tst_qsgimageparticle::test_tabled() void tst_qsgimageparticle::test_sprite() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/sprite.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/sprite.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgitemparticle/tst_qsgitemparticle.cpp b/tests/auto/particles/qsgitemparticle/tst_qsgitemparticle.cpp index e58ab834f9..07ae377f0f 100644 --- a/tests/auto/particles/qsgitemparticle/tst_qsgitemparticle.cpp +++ b/tests/auto/particles/qsgitemparticle/tst_qsgitemparticle.cpp @@ -42,7 +42,7 @@ #include <QtTest/QtTest> #include "../shared/particlestestsshared.h" #include <private/qsgparticlesystem_p.h> -#include <private/qsgimage_p.h> +#include <private/qquickimage_p.h> #include <private/qabstractanimation_p.h> class tst_qsgitemparticle : public QObject @@ -62,7 +62,7 @@ tst_qsgitemparticle::tst_qsgitemparticle() void tst_qsgitemparticle::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -86,7 +86,7 @@ void tst_qsgitemparticle::test_basic() if (d->t < ((qreal)system->timeInt/1000.0) - 0.45)//Delegates cleared on death continue; QVERIFY(d->delegate); - QVERIFY(qobject_cast<QSGImage*>(d->delegate)); + QVERIFY(qobject_cast<QQuickImage*>(d->delegate)); } } diff --git a/tests/auto/particles/qsglineextruder/tst_qsglineextruder.cpp b/tests/auto/particles/qsglineextruder/tst_qsglineextruder.cpp index 0f25f50089..b66c174211 100644 --- a/tests/auto/particles/qsglineextruder/tst_qsglineextruder.cpp +++ b/tests/auto/particles/qsglineextruder/tst_qsglineextruder.cpp @@ -61,7 +61,7 @@ tst_qsglineextruder::tst_qsglineextruder() void tst_qsglineextruder::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgmaskextruder/tst_qsgmaskextruder.cpp b/tests/auto/particles/qsgmaskextruder/tst_qsgmaskextruder.cpp index 03070d8be0..962ab27508 100644 --- a/tests/auto/particles/qsgmaskextruder/tst_qsgmaskextruder.cpp +++ b/tests/auto/particles/qsgmaskextruder/tst_qsgmaskextruder.cpp @@ -61,7 +61,7 @@ tst_qsgmaskextruder::tst_qsgmaskextruder() void tst_qsgmaskextruder::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgparticlegroup/tst_qsgparticlegroup.cpp b/tests/auto/particles/qsgparticlegroup/tst_qsgparticlegroup.cpp index 49dc197ebb..f49f3c444d 100644 --- a/tests/auto/particles/qsgparticlegroup/tst_qsgparticlegroup.cpp +++ b/tests/auto/particles/qsgparticlegroup/tst_qsgparticlegroup.cpp @@ -61,7 +61,7 @@ tst_qsgparticlegroup::tst_qsgparticlegroup() void tst_qsgparticlegroup::test_instantTransition() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgparticlesystem/tst_qsgparticlesystem.cpp b/tests/auto/particles/qsgparticlesystem/tst_qsgparticlesystem.cpp index 9c6f299884..06a2414e95 100644 --- a/tests/auto/particles/qsgparticlesystem/tst_qsgparticlesystem.cpp +++ b/tests/auto/particles/qsgparticlesystem/tst_qsgparticlesystem.cpp @@ -61,7 +61,7 @@ tst_qsgparticlesystem::tst_qsgparticlesystem() void tst_qsgparticlesystem::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgpointattractor/tst_qsgpointattractor.cpp b/tests/auto/particles/qsgpointattractor/tst_qsgpointattractor.cpp index 9e4ff328a7..14207f9fd6 100644 --- a/tests/auto/particles/qsgpointattractor/tst_qsgpointattractor.cpp +++ b/tests/auto/particles/qsgpointattractor/tst_qsgpointattractor.cpp @@ -61,7 +61,7 @@ tst_qsgpointattractor::tst_qsgpointattractor() void tst_qsgpointattractor::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgpointdirection/tst_qsgpointdirection.cpp b/tests/auto/particles/qsgpointdirection/tst_qsgpointdirection.cpp index c6a3a2c9b8..b9b3dc15cb 100644 --- a/tests/auto/particles/qsgpointdirection/tst_qsgpointdirection.cpp +++ b/tests/auto/particles/qsgpointdirection/tst_qsgpointdirection.cpp @@ -61,7 +61,7 @@ tst_qsgpointdirection::tst_qsgpointdirection() void tst_qsgpointdirection::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgrectangleextruder/tst_qsgrectangleextruder.cpp b/tests/auto/particles/qsgrectangleextruder/tst_qsgrectangleextruder.cpp index e8c27aab34..dd86713b5b 100644 --- a/tests/auto/particles/qsgrectangleextruder/tst_qsgrectangleextruder.cpp +++ b/tests/auto/particles/qsgrectangleextruder/tst_qsgrectangleextruder.cpp @@ -61,7 +61,7 @@ tst_qsgrectangleextruder::tst_qsgrectangleextruder() void tst_qsgrectangleextruder::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgtargetdirection/tst_qsgtargetdirection.cpp b/tests/auto/particles/qsgtargetdirection/tst_qsgtargetdirection.cpp index decc96117a..5637c4c473 100644 --- a/tests/auto/particles/qsgtargetdirection/tst_qsgtargetdirection.cpp +++ b/tests/auto/particles/qsgtargetdirection/tst_qsgtargetdirection.cpp @@ -61,7 +61,7 @@ tst_qsgtargetdirection::tst_qsgtargetdirection() void tst_qsgtargetdirection::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgtrailemitter/tst_qsgtrailemitter.cpp b/tests/auto/particles/qsgtrailemitter/tst_qsgtrailemitter.cpp index e24c63c9d5..19a63fb73d 100644 --- a/tests/auto/particles/qsgtrailemitter/tst_qsgtrailemitter.cpp +++ b/tests/auto/particles/qsgtrailemitter/tst_qsgtrailemitter.cpp @@ -61,7 +61,7 @@ tst_qsgtrailemitter::tst_qsgtrailemitter() void tst_qsgtrailemitter::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgturbulence/tst_qsgturbulence.cpp b/tests/auto/particles/qsgturbulence/tst_qsgturbulence.cpp index 4230bc529f..ca8a797b78 100644 --- a/tests/auto/particles/qsgturbulence/tst_qsgturbulence.cpp +++ b/tests/auto/particles/qsgturbulence/tst_qsgturbulence.cpp @@ -61,7 +61,7 @@ tst_qsgturbulence::tst_qsgturbulence() void tst_qsgturbulence::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/qsgwander/tst_qsgwander.cpp b/tests/auto/particles/qsgwander/tst_qsgwander.cpp index b200b6fbf0..56ae15e7bb 100644 --- a/tests/auto/particles/qsgwander/tst_qsgwander.cpp +++ b/tests/auto/particles/qsgwander/tst_qsgwander.cpp @@ -61,7 +61,7 @@ tst_qsgwander::tst_qsgwander() void tst_qsgwander::test_basic() { - QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h index ed483bae01..ab6b5f16af 100644 --- a/tests/auto/particles/shared/particlestestsshared.h +++ b/tests/auto/particles/shared/particlestestsshared.h @@ -41,7 +41,7 @@ #ifndef PARTICLES_TESTS_SHARED #define PARTICLES_TESTS_SHARED -#include <QSGView> +#include <QQuickView> #include <QtTest> #include <QAbstractAnimation> const qreal EPSILON = 0.0001; @@ -66,12 +66,12 @@ bool myFuzzyGEQ(qreal a, qreal b) return (a + EPSILON > b); } -QSGView* createView(const QString &filename, int additionalWait=0) +QQuickView* createView(const QString &filename, int additionalWait=0) { - QSGView *canvas = new QSGView(0); + QQuickView *canvas = new QQuickView(0); canvas->setSource(QUrl::fromLocalFile(filename)); - if (canvas->status() != QSGView::Ready) + if (canvas->status() != QQuickView::Ready) return 0; canvas->show(); QTest::qWaitForWindowShown(canvas); |