From a6814650232825663f33fe4f11a362c397385350 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 23 May 2016 15:20:29 +0200 Subject: Get rid of QQmlVMEMetaData It is unused now and we can remove it as well as its QByteArray based storage. The non-emptyness of the meta-data QByteArray was also used to indicate whether it is necessary to create a VME meta-object when instantiating an object. This bit is now folded into the flag of the QFlagPointer storing the property caches. Change-Id: I3c3604c61ff16a4e76912e68b1c19afdb0f2bd9d Reviewed-by: Lars Knoll --- src/qml/qml/qqmlobjectcreator_p.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlobjectcreator_p.h') diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 3d743954c9..8045281cbb 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -142,8 +142,7 @@ private: QQmlGuardedContextData parentContext; QQmlContextData *context; const QHash &resolvedTypes; - const QVector &propertyCaches; - const QVector &vmeMetaObjectData; + const QQmlPropertyCacheVector &propertyCaches; QHash objectIndexToId; QExplicitlySharedDataPointer sharedState; bool topLevelCreator; -- cgit v1.2.3