diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-15 08:57:33 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-16 19:05:57 +0000 |
| commit | 4da7ca32bb271355ae3e707499a3f5627de069d4 (patch) | |
| tree | 73d6398c6f9c9fd16279b9b0b905934e0ce78441 /src/qml/compiler/qqmlpropertycachecreator_p.h | |
| parent | f2c97b4e307a62b831f68a0278551d4375170336 (diff) | |
Minor QQmlPropertyCacheCreator API cleanup
As part of removing the QQmlTypeCompiler dependency, the property cache
vector output of the creator is now passed explicitly as an out
parameter to the constructor.
Similarly the error handling is made explicit in the API instead of
implicitly passing any generated errors to the QQmlTypeCompiler.
Change-Id: Ia3013011518f59f57f2eecb526f64dec7d82cb91
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler/qqmlpropertycachecreator_p.h')
| -rw-r--r-- | src/qml/compiler/qqmlpropertycachecreator_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/compiler/qqmlpropertycachecreator_p.h b/src/qml/compiler/qqmlpropertycachecreator_p.h index 126bdbb017..8dd4b2bc0f 100644 --- a/src/qml/compiler/qqmlpropertycachecreator_p.h +++ b/src/qml/compiler/qqmlpropertycachecreator_p.h @@ -58,12 +58,12 @@ class QQmlPropertyCacheCreator : public QQmlCompilePass { Q_DECLARE_TR_FUNCTIONS(QQmlPropertyCacheCreator) public: - QQmlPropertyCacheCreator(QQmlTypeCompiler *typeCompiler); + QQmlPropertyCacheCreator(QQmlTypeCompiler *typeCompiler, QQmlPropertyCacheVector *propertyCaches); ~QQmlPropertyCacheCreator(); - bool buildMetaObjects(); -protected: + QQmlCompileError buildMetaObjects(); +protected: struct InstantiationContext { InstantiationContext(); InstantiationContext(int referencingObjectIndex, const QV4::CompiledData::Binding *instantiatingBinding, const QString &instantiatingPropertyName, const QQmlPropertyCache *referencingObjectPropertyCache); @@ -81,7 +81,7 @@ protected: const QVector<QmlIR::Object*> &qmlObjects; const QQmlImports *imports; QHash<int, QV4::CompiledData::CompilationUnit::ResolvedTypeReference*> *resolvedTypes; - QQmlPropertyCacheVector propertyCaches; + QQmlPropertyCacheVector *propertyCaches; }; QT_END_NAMESPACE |