Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
	dependencies.yaml
	src/qml/qml/qqmlengine.cpp

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/quick/particles/affectors/content/customaffector.qml b/examples/quick/particles/affectors/content/customaffector.qml
index 71646bcf39..6fabfb3ab2 100644
--- a/examples/quick/particles/affectors/content/customaffector.qml
+++ b/examples/quick/particles/affectors/content/customaffector.qml
@@ -81,7 +81,7 @@ Item {
             property real velocity: 1.5
             width: parent.width
             height: parent.height - 100
-            onAffectParticles: {
+            onAffectParticles: (particles, dt) => {
             /*  //Linear movement
                 if (particle.r == 0) {
                     particle.r = Math.random() > 0.5 ? -1 : 1;
@@ -117,7 +117,7 @@ Item {
             width: parent.width + 120
             height: 100
             anchors.bottom: parent.bottom
-            onAffectParticles: {
+            onAffectParticles: (particles, dt) => {
                 for (var i=0; i<particles.length; i++) {
                     var particle = particles[i];
                     var pseudoRand = (Math.floor(particle.t*1327) % 10) + 1;