1 files changed, 11 insertions, 5 deletions
diff --git a/src/qml/compiler/qqmlcodegenerator_p.h b/src/qml/compiler/qqmlcodegenerator_p.h
index 0a0e4f2d5b..f1050f4476 100644
--- a/src/qml/compiler/qqmlcodegenerator_p.h
+++ b/src/qml/compiler/qqmlcodegenerator_p.h
@@ -135,6 +135,8 @@ struct Binding : public QV4::CompiledData::Binding
 
 struct Function
 {
+    AST::FunctionDeclaration *functionDeclaration;
+    QV4::CompiledData::Location location;
     int index; // index in parsedQML::functions
     Function *next;
 };
@@ -153,6 +155,8 @@ struct QmlObject
     PoolList<Binding> *bindings;
     PoolList<Function> *functions;
 
+    void init(QQmlJS::MemoryPool *pool, int typeNameIndex, int id, const AST::SourceLocation &location = AST::SourceLocation());
+
     void dump(DebugStream &out);
 };
 
@@ -207,7 +211,7 @@ struct Q_QML_EXPORT QQmlCodeGenerator : public AST::Visitor
 {
     Q_DECLARE_TR_FUNCTIONS(QQmlCodeGenerator)
 public:
-    QQmlCodeGenerator();
+    QQmlCodeGenerator(const QSet<QString> &illegalNames);
     bool generateFromQml(const QString &code, const QUrl &url, const QString &urlString, ParsedQML *output);
 
     static bool isSignalPropertyName(const QString &name);
@@ -253,9 +257,9 @@ public:
     void setBindingValue(QV4::CompiledData::Binding *binding, AST::Statement *statement);
 
     void appendBinding(AST::UiQualifiedId *name, AST::Statement *value);
-    void appendBinding(AST::UiQualifiedId *name, int objectIndex);
+    void appendBinding(AST::UiQualifiedId *name, int objectIndex, bool isOnAssignment = false);
     void appendBinding(const AST::SourceLocation &nameLocation, int propertyNameIndex, AST::Statement *value);
-    void appendBinding(const AST::SourceLocation &nameLocation, int propertyNameIndex, int objectIndex, bool isListItem = false);
+    void appendBinding(const AST::SourceLocation &nameLocation, int propertyNameIndex, int objectIndex, bool isListItem = false, bool isOnAssignment = false);
 
     bool setId(AST::Statement *value);
 
@@ -263,7 +267,7 @@ public:
     // with the object any right-hand-side of a binding should apply to.
     bool resolveQualifiedId(AST::UiQualifiedId **nameToResolve, QmlObject **object);
 
-    bool sanityCheckPropertyName(const AST::SourceLocation &nameLocation, int nameIndex, bool isListItem = false);
+    bool sanityCheckPropertyName(const AST::SourceLocation &nameLocation, int nameIndex, bool isListItemOnOrAssignment = false);
 
     void recordError(const AST::SourceLocation &location, const QString &description);
 
@@ -272,7 +276,7 @@ public:
     static QQmlScript::LocationSpan location(AST::SourceLocation start, AST::SourceLocation end);
 
     int registerString(const QString &str) const { return jsGenerator->registerString(str); }
-    template <typename _Tp> _Tp *New() { return new (pool->allocate(sizeof(_Tp))) _Tp(); }
+    template <typename _Tp> _Tp *New() { return pool->New<_Tp>(); }
 
     QString stringAt(int index) const { return jsGenerator->strings.at(index); }
 
@@ -280,6 +284,8 @@ public:
 
     QList<QQmlError> errors;
 
+    QSet<QString> illegalNames;
+
     QList<QV4::CompiledData::Import*> _imports;
     QList<Pragma*> _pragmas;
     QList<QmlObject*> _objects;