Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/qml/jsruntime/qv4variantobject.cpp
	src/qml/types/qquickworkerscript.cpp
	src/quick/scenegraph/util/qsgdefaultpainternode_p.h
	tools/qmljs/qmljs.cpp

Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59

1 files changed, 4 insertions, 3 deletions

diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp
index fbdbb85e94..967652f31a 100644
--- a/src/particles/qquickv4particledata.cpp
+++ b/src/particles/qquickv4particledata.cpp
@@ -273,10 +273,11 @@ QT_BEGIN_NAMESPACE
 struct QV4ParticleData : public QV4::Object
 {
     struct Data : QV4::Object::Data {
-        Data(QQuickParticleData *datum, QQuickParticleSystem* particleSystem)
-            : datum(datum)
-            , particleSystem(particleSystem)
+        void init(QQuickParticleData *datum, QQuickParticleSystem* particleSystem)
         {
+            Object::init();
+            this->datum = datum;
+            this->particleSystem = particleSystem;
         }
         QQuickParticleData* datum;//TODO: Guard needed?
         QQuickParticleSystem* particleSystem;