diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2014-12-19 11:21:00 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals@canonical.com> | 2015-01-05 12:02:21 +0100 |
| commit | c7ab634fc7aba84771586d782decd27db19650bf (patch) | |
| tree | dc6337dcd51978eb868d4ec00014e55519e59939 | |
| parent | 2fe82c505d09fdf372f1d4c5992a3a0b0dc98f33 (diff) | |
Add propertyName to error
May help a bit to the reader, even if the line is already there
sometimes it can be confusing if it is a default property like data
Change-Id: I5cb8e8833c78a784ad4f5541d094840477e8f350
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/listAssignment.1.errors.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index 98c86c6a85..c2d123c96f 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -2346,7 +2346,7 @@ bool QQmlPropertyValidator::validateObjectBinding(QQmlPropertyData *property, co if (!QQmlMetaType::isInterface(listType)) { QQmlPropertyCache *source = propertyCaches.at(binding->value.objectIndex); if (!canCoerce(listType, source)) { - recordError(binding->valueLocation, tr("Cannot assign object to list")); + recordError(binding->valueLocation, tr("Cannot assign object to list property \"%1\"").arg(propertyName)); return false; } } diff --git a/tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt b/tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt index 76809dc9a1..3a9d8d7cf6 100644 --- a/tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt +++ b/tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt @@ -1 +1 @@ -4:15:Cannot assign object to list +4:15:Cannot assign object to list property "children" diff --git a/tests/auto/qml/qqmllanguage/data/listAssignment.1.errors.txt b/tests/auto/qml/qqmllanguage/data/listAssignment.1.errors.txt index 35d2d3510e..2702d26bc2 100644 --- a/tests/auto/qml/qqmllanguage/data/listAssignment.1.errors.txt +++ b/tests/auto/qml/qqmllanguage/data/listAssignment.1.errors.txt @@ -1 +1 @@ -4:24:Cannot assign object to list +4:24:Cannot assign object to list property "containerChildren" |