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

Conflicts:
	src/quick/items/qquickaccessibleattached_p.h
	src/quick/items/qquickwindow.cpp
	src/quick/scenegraph/qsgthreadedrenderloop.cpp

Change-Id: I8bf07487a75f9d1b0d6efa5914dd06875fc9654d

1 files changed, 20 insertions, 0 deletions

diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index f751b0f447..be64851a19 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -478,6 +478,26 @@ QQuickParticleData::~QQuickParticleData()
     delete v8Datum;
 }
 
+QQuickParticleData::QQuickParticleData(const QQuickParticleData &other)
+{
+    *this = other;
+}
+
+QQuickParticleData &QQuickParticleData::operator=(const QQuickParticleData &other)
+{
+    clone(other);
+
+    group = other.group;
+    e = other.e;
+    system = other.system;
+    index = other.index;
+    systemIndex = other.systemIndex;
+    // Lazily initialized
+    v8Datum = 0;
+
+    return *this;
+}
+
 void QQuickParticleData::clone(const QQuickParticleData& other)
 {
     x = other.x;