Reduce dependency of QQmlPropertyValidator on QQmlTypeCompiler

This is in preparation for future use beyond the type compiler when
loading compilation units off disk.

Change-Id: Ic1ea89518cec32b336153ecf32641fc7f8b7db0c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h
index f0909d56fa..17125a69f0 100644
--- a/src/qml/compiler/qqmltypecompiler_p.h
+++ b/src/qml/compiler/qqmltypecompiler_p.h
@@ -303,7 +303,7 @@ class QQmlPropertyValidator : public QQmlCompilePass
 {
     Q_DECLARE_TR_FUNCTIONS(QQmlPropertyValidator)
 public:
-    QQmlPropertyValidator(QQmlTypeCompiler *typeCompiler, const QQmlPropertyCacheVector *propertyCaches);
+    QQmlPropertyValidator(QQmlTypeCompiler *typeCompiler, QQmlEnginePrivate *enginePrivate, const QQmlImports &imports, QV4::CompiledData::CompilationUnit *compilationUnit);
 
     bool validate();
 
@@ -318,10 +318,9 @@ private:
     const QQmlImports &imports;
     const QV4::CompiledData::Unit *qmlUnit;
     const QHash<int, QV4::CompiledData::CompilationUnit::ResolvedTypeReference*> &resolvedTypes;
-    const QQmlPropertyCacheVector * const propertyCaches;
+    const QQmlPropertyCacheVector &propertyCaches;
 
-    // collected state variables, essentially write-only
-    mutable QVector<QV4::CompiledData::BindingPropertyData> _bindingPropertyDataPerObject;
+    QVector<QV4::CompiledData::BindingPropertyData> * const bindingPropertyDataPerObject;
 };
 
 // ### merge with QtQml::JSCodeGen and operate directly on object->functionsAndExpressions once old compiler is gone.