diff options
-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" |