Store all properties in one Javascript array

Store both "normal" properties and var properties in the same js array.
The second array which is removed by this patch was scaffolding for the
initial brinup.

Change-Id: I24f72a1d880a54f68f5562e5077dbc26e7db864a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index a87feec043..c4ca128e87 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -198,18 +198,10 @@ public:
     QQmlVMEVariant *data;
     QQmlVMEMetaObjectEndpoint *aliasEndpoints;
 
-    QV4::WeakValue varProperties;
-    int firstVarPropertyIndex;
-    bool varPropertiesInitialized;
-    inline void allocateVarPropertiesArray();
-    inline bool ensureVarPropertiesAllocated();
-
-    // temporary solution so I can experiment with storing
-    // properties in a JS array. Should be switched over to also
-    // use the 'varProperties' in the end.
     QV4::WeakValue properties;
+    int firstVarPropertyIndex;
     bool propertiesInitialized;
-    inline void allocatePropertiesArray();
+    inline void allocateProperties();
     inline bool ensurePropertiesAllocated();
 
     int readPropertyAsInt(int id);