aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qqmltypecompiler_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-01-24 16:49:03 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-28 10:41:46 +0100
commitcad0f7e5b9915b1f4579f25121f7b9231405bfa2 (patch)
tree63b0a6347408587f9d495dde83448cc674203e9b /src/qml/compiler/qqmltypecompiler_p.h
parent118c2d30b9d031175dfff3085264be5612e4a419 (diff)
[new compiler] Improved error handling
* When reporting errors with literal bindings, use the correct location for the report, the place where the literal value is declared. * Create property caches for group properties, so that later in the property validator we can do extra checks * Report an error when trying to declare an object to the default property of a group property * Similarlyl report an error when trying to use sub-objects with value type properties * Temporarily change tst_qqmllanguage::errors() to also try to instantiate the component, because for the moment some errors are only reported at instantiating time instead of compile time. That'll be fixed later when move checks get moved into the property validator. Change-Id: Icaa8d2edc7918c03001c40fba7880ee5cac10e69 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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h
index 28229a13a9..29c045816d 100644
--- a/src/qml/compiler/qqmltypecompiler_p.h
+++ b/src/qml/compiler/qqmltypecompiler_p.h
@@ -190,7 +190,7 @@ public:
virtual QQmlBinding::Identifier bindingIdentifier(const QV4::CompiledData::Binding *binding, QQmlCustomParser *parser);
private:
- bool validateObject(int objectIndex);
+ bool validateObject(int objectIndex, const QV4::CompiledData::Binding *instantiatingBinding);
bool isComponent(int objectIndex) const { return objectIndexToIdPerComponent.contains(objectIndex); }