diff options
| author | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2015-07-25 19:57:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-18 20:26:05 +0000 |
| commit | a6e4c64812ee4846677608f2334d8fd3eee76756 (patch) | |
| tree | b09a7f915aba5b309f30acd58dd549c673f6ee85 | |
| parent | 37fbe667e6b5a528592b244124189981ba4aada9 (diff) | |
Remove the QQmlVMEVariant array member
All properties have been move into the varProperties JS array.
Change-Id: Ib39a603d43ab5ef23aad3e6ccbdbc9b981c9da18
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 5 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index a960797626..0873bef993 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -515,7 +515,7 @@ QQmlVMEMetaObject::QQmlVMEMetaObject(QObject *obj, const QQmlVMEMetaData *meta, QV4::ExecutionContext *qmlBindingContext, QQmlCompiledData *compiledData) : object(obj), ctxt(QQmlData::get(obj, true)->outerContext), cache(cache), metaData(meta), - hasAssignedMetaObjectData(false), data(0), aliasEndpoints(0), firstVarPropertyIndex(-1), + hasAssignedMetaObjectData(false), aliasEndpoints(0), firstVarPropertyIndex(-1), propertiesInitialized(false), interceptors(0), v8methods(0) { QObjectPrivate *op = QObjectPrivate::get(obj); @@ -530,8 +530,6 @@ QQmlVMEMetaObject::QQmlVMEMetaObject(QObject *obj, op->metaObject = this; QQmlData::get(obj)->hasVMEMetaObject = true; - data = new QQmlVMEVariant[metaData->propertyCount - metaData->varPropertyCount]; - aConnected.resize(metaData->aliasCount); int list_type = qMetaTypeId<QQmlListProperty<QObject> >(); int qobject_type = qMetaTypeId<QObject*>(); @@ -576,7 +574,6 @@ QQmlVMEMetaObject::QQmlVMEMetaObject(QObject *obj, QQmlVMEMetaObject::~QQmlVMEMetaObject() { if (parent.isT1()) parent.asT1()->objectDestroyed(object); - delete [] data; delete [] aliasEndpoints; delete [] v8methods; diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 7009b47a5f..7c881f1350 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -195,7 +195,6 @@ public: inline int signalCount() const; bool hasAssignedMetaObjectData; - QQmlVMEVariant *data; QQmlVMEMetaObjectEndpoint *aliasEndpoints; QV4::WeakValue properties; |