diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-21 01:10:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-21 08:04:34 +0100 |
| commit | b3d8a4d47db63a06d354b6002ec764fd1442ec6e (patch) | |
| tree | 7698afa9e80b58db70fcf6cd5163beaa33a10688 /src/qml/compiler/qqmltypecompiler.cpp | |
| parent | 20d9454ce6c32e61794f68d75fc82bd67737a306 (diff) | |
Cleanupsv5.3.0-beta1
* Get rid of members in QQmlCompiledData that were used by the VME
and are now unused
* Get rid of QQmlVME friend declarations that are not needed anymore
Change-Id: I11b4b6f0b4b0b60edf92a1256be3d0d44d76bbc9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler.cpp')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index 0b9f9faf09..9e2ab9e046 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -140,7 +140,7 @@ bool QQmlTypeCompiler::compile() customParsers.insert(it.key(), customParser); } - compiledData->datas.reserve(document->objects.count()); + compiledData->metaObjects.reserve(document->objects.count()); compiledData->propertyCaches.reserve(document->objects.count()); { @@ -349,13 +349,13 @@ const QVector<QQmlPropertyCache *> &QQmlTypeCompiler::propertyCaches() const void QQmlTypeCompiler::setVMEMetaObjects(const QVector<QByteArray> &metaObjects) { - Q_ASSERT(compiledData->datas.isEmpty()); - compiledData->datas = metaObjects; + Q_ASSERT(compiledData->metaObjects.isEmpty()); + compiledData->metaObjects = metaObjects; } QVector<QByteArray> *QQmlTypeCompiler::vmeMetaObjects() const { - return &compiledData->datas; + return &compiledData->metaObjects; } QHash<int, int> *QQmlTypeCompiler::objectIndexToIdForRoot() |