diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-12 15:02:42 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-12 15:56:12 +0200 |
commit | 728879def455979bb091773d4dedd4ee3277e635 (patch) | |
tree | fce4b156a1315b121035dc818f4b8228fe1a85b3 /src/particles/qquickparticleemitter.cpp | |
parent | a3b88ec8988247c8d36a8786a557bd160a9131ba (diff) |
Convert v8::Array usage in particles to V4
Change-Id: Ib3c39903bf8f8507d68f94baea81b3bf642ce8f6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/particles/qquickparticleemitter.cpp')
-rw-r--r-- | src/particles/qquickparticleemitter.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index 630565f8f2..cc410fbfbe 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -477,13 +477,16 @@ void QQuickParticleEmitter::emitWindow(int timeStamp) m_system->emitParticle(d); if (isEmitConnected()) { + QQmlEngine *qmlEngine = ::qmlEngine(this); + QV4::ExecutionEngine *v4 = QV8Engine::getV4(qmlEngine->handle()); + //Done after emitParticle so that the Painter::load is done first, this allows you to customize its static variables //We then don't need to request another reload, because the first reload isn't scheduled until we get back to the render thread - v8::Handle<v8::Array> array = v8::Array::New(toEmit.size()); + QV4::ArrayObject *array = v4->newArrayObject(toEmit.size()); for (int i=0; i<toEmit.size(); i++) - array->Set(i, toEmit[i]->v4Value().toValue()); + array->putIndexed(i, toEmit[i]->v4Value().toValue()); - emitParticles(QQmlV4Handle(array->v4Value()));//A chance for arbitrary JS changes + emitParticles(QQmlV4Handle(QV4::Value::fromObject(array)));//A chance for arbitrary JS changes } m_last_emission = pt; |