diff options
Diffstat (limited to 'src/qml/qml/qqmlcompiler_p.h')
-rw-r--r-- | src/qml/qml/qqmlcompiler_p.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlcompiler_p.h b/src/qml/qml/qqmlcompiler_p.h index a56af15b5a..9432811f5b 100644 --- a/src/qml/qml/qqmlcompiler_p.h +++ b/src/qml/qml/qqmlcompiler_p.h @@ -127,15 +127,10 @@ public: QHash<int, TypeReference*> resolvedTypes; QQmlPropertyCache *rootPropertyCache; - QList<QString> primitives; - QVector<QByteArray> datas; - QByteArray bytecode; + QVector<QByteArray> metaObjects; QVector<QQmlPropertyCache *> propertyCaches; - QList<QVector<QQmlContextData::ObjectIdMapping> > contextCaches; QList<QQmlScriptData *> scripts; - QList<QUrl> urls; - // --- new compiler QV4::CompiledData::CompilationUnit *compilationUnit; QV4::CompiledData::QmlUnit *qmlUnit; // index in first hash is component index, hash inside maps from object index in that scope to integer id @@ -154,7 +149,7 @@ public: int totalObjectCount; // Number of objects explicitly instantiated bool isComponent(int objectIndex) const { return objectIndexToIdPerComponent.contains(objectIndex); } - bool isCompositeType() const { return !datas.at(qmlUnit->indexOfRootObject).isEmpty(); } + bool isCompositeType() const { return !metaObjects.at(qmlUnit->indexOfRootObject).isEmpty(); } bool isInitialized() const { return hasEngine(); } void initialize(QQmlEngine *); |