diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-20 13:48:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-02 14:48:18 +0100 |
| commit | c021fd9aa8ccf30f63b8a21e3ae6cdf8a45d0b1f (patch) | |
| tree | 37a819aaaca8c1d236153b454a6d211d7a3c31b5 /src/qml/compiler/qqmltypecompiler_p.h | |
| parent | a37177dfe48534933b3d62d2ac83f41527dd78e8 (diff) | |
[new compiler] Fix error reporting for group properties
Report errors when setting group properties multiple times, or when
assigning values to them. Some of this can be done right after parsing,
some of it requires knowledge about the type of group property (QObject or
value type)
Change-Id: I1aa33e64a5f64dfa4f625469f5b6a84cd8dfb18d
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h index 0a20e0dd54..3ef3bbf55f 100644 --- a/src/qml/compiler/qqmltypecompiler_p.h +++ b/src/qml/compiler/qqmltypecompiler_p.h @@ -226,7 +226,7 @@ public: virtual QQmlBinding::Identifier bindingIdentifier(const QV4::CompiledData::Binding *binding, QQmlCustomParser *parser); private: - bool validateObject(int objectIndex, const QV4::CompiledData::Binding *instantiatingBinding); + bool validateObject(int objectIndex, const QV4::CompiledData::Binding *instantiatingBinding, bool populatingValueTypeGroupProperty = false); bool validateLiteralBinding(QQmlPropertyCache *propertyCache, QQmlPropertyData *property, const QV4::CompiledData::Binding *binding); bool validateObjectBinding(QQmlPropertyData *property, const QString &propertyName, const QV4::CompiledData::Binding *binding); |