3 files changed, 9 insertions, 6 deletions
diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp
index aa2617e64c..67f2922423 100644
--- a/src/particles/qquickcustomaffector.cpp
+++ b/src/particles/qquickcustomaffector.cpp
@@ -157,7 +157,7 @@ void QQuickCustomAffector::affectSystem(qreal dt)
     const auto doAffect = [&](qreal dt) {
         affectProperties(toAffect, dt);
         QJSValue particles;
-        QJSValuePrivate::setValue(&particles, v4, array);
+        QJSValuePrivate::setValue(&particles, array);
         emit affectParticles(particles, dt);
     };
 
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index 3e9d7c02a9..62bf83994f 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -497,7 +497,7 @@ void QQuickParticleEmitter::emitWindow(int timeStamp)
             array->put(i, (v = toEmit[i]->v4Value(m_system)));
 
         QJSValue particles;
-        QJSValuePrivate::setValue(&particles, v4, array);
+        QJSValuePrivate::setValue(&particles, array);
         emit emitParticles(particles);//A chance for arbitrary JS changes
     }
 
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index 5720460bae..05afdf9d1f 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -278,11 +278,14 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
                 array->put(i, (v = toEmit[i]->v4Value(m_system)));
 
             QJSValue particles;
-            QJSValuePrivate::setValue(&particles, v4, array);
-            if (isEmitFollowConnected())
-                emit emitFollowParticles(particles, QJSValue(v4, d->v4Value(m_system)));//A chance for many arbitrary JS changes
-            else if (isEmitConnected())
+            QJSValuePrivate::setValue(&particles, array);
+            if (isEmitFollowConnected()) {
+                //A chance for many arbitrary JS changes
+                emit emitFollowParticles(
+                        particles, QJSValuePrivate::fromReturnedValue(d->v4Value(m_system)));
+            } else if (isEmitConnected()) {
                 emit emitParticles(particles);//A chance for arbitrary JS changes
+            }
         }
         m_lastEmission[d->index] = pt;
     }