diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-27 16:00:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-29 10:08:46 +0100 |
| commit | 7cfd7ab2b1244681e384ec4640ee6e528881f4af (patch) | |
| tree | 2ac466eeb6fff75f32c0025f98148bb13d73630b /src/qml/compiler/qqmltypecompiler_p.h | |
| parent | 977a335ccd16e162d1aeaf0ab569afe98faed0f4 (diff) | |
[new compiler] Fix timing of property assignment error handling
Most property assignment errors are now handled at type compile time, just
like in the old compiler. This speeds up the object creation code and
restores behavior expected in the qqmllanguage tests.
Change-Id: If213cd0bfa4dd51d9065c27809a79a6495c9f3ce
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler_p.h')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h index 29c045816d..b698d98f4e 100644 --- a/src/qml/compiler/qqmltypecompiler_p.h +++ b/src/qml/compiler/qqmltypecompiler_p.h @@ -191,9 +191,12 @@ public: private: bool validateObject(int objectIndex, const QV4::CompiledData::Binding *instantiatingBinding); + bool validateLiteralBinding(QQmlPropertyCache *propertyCache, QQmlPropertyData *property, const QV4::CompiledData::Binding *binding); + bool validateObjectBinding(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding); bool isComponent(int objectIndex) const { return objectIndexToIdPerComponent.contains(objectIndex); } + QQmlEnginePrivate *enginePrivate; const QV4::CompiledData::QmlUnit *qmlUnit; const QHash<int, QQmlCompiledData::TypeReference*> &resolvedTypes; const QVector<QQmlPropertyCache *> &propertyCaches; |