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, 20 insertions, 5 deletions

diff --git a/src/qml/util/qqmlchangeset_p.h b/src/qml/util/qqmlchangeset_p.h
index b7a637fb2e..8e1fa3f9f2 100644
--- a/src/qml/util/qqmlchangeset_p.h
+++ b/src/qml/util/qqmlchangeset_p.h
@@ -68,16 +68,31 @@ public:
         int offset;
     };
 
-    struct Change
+    // The storrage for Change (below). This struct is trivial, which it has to be in order to store
+    // it in a QV4::Heap::Base object. The Change struct doesn't add any storage fields, so it is
+    // safe to cast ChangeData to/from Change.
+    struct ChangeData
     {
-        Change() : index(0), count(0), moveId(-1) {}
-        Change(int index, int count, int moveId = -1, int offset = 0)
-            : index(index), count(count), moveId(moveId), offset(offset) {}
-
         int index;
         int count;
         int moveId;
         int offset;
+    };
+
+    struct Change: ChangeData
+    {
+        Change() {
+            index = 0;
+            count = 0;
+            moveId = -1;
+            offset = 0;
+        }
+        Change(int index, int count, int moveId = -1, int offset = 0) {
+            this->index = index;
+            this->count = count;
+            this->moveId = moveId;
+            this->offset = offset;
+        }
 
         bool isMove() const { return moveId >= 0; }