Move VariantObject over to new storage layout

Change-Id: I96a4ce5d3a3e4fdd29ba0aac1bd3361588457580
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 12 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4variantobject_p.h b/src/qml/jsruntime/qv4variantobject_p.h
index 656608d49b..ab2ef55e15 100644
--- a/src/qml/jsruntime/qv4variantobject_p.h
+++ b/src/qml/jsruntime/qv4variantobject_p.h
@@ -64,10 +64,19 @@ QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
-struct VariantObject : Object, public ExecutionEngine::ScarceResourceData
+struct VariantObject : Object
 {
-    V4_OBJECT
-public:
+    struct Data : Object::Data, public ExecutionEngine::ScarceResourceData
+    {
+        int vmePropertyReferenceCount;
+    };
+    struct __Data : public ExecutionEngine::ScarceResourceData
+    {
+        int vmePropertyReferenceCount;
+    } __data;
+
+    V4_OBJECT_NEW
+
     VariantObject(InternalClass *ic);
     VariantObject(ExecutionEngine *engine, const QVariant &value);
 
@@ -76,7 +85,6 @@ public:
     void addVmePropertyReference();
     void removeVmePropertyReference();
     bool isScarce() const;
-    int m_vmePropertyReferenceCount;
 
     static void destroy(Managed *that);
     static bool isEqualTo(Managed *m, Managed *other);