aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qqmlcodegenerator.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-01-31 15:42:20 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-03 14:38:12 +0100
commit5d8a642f210e9b5a6187573ee75db6ca6c68c103 (patch)
treea5e4d3d158f291920942ce9d85b4bbb5da1e748d /src/qml/compiler/qqmlcodegenerator.cpp
parentd60251910eb3700f0f45e2fadf61dd457b094412 (diff)
[new compiler] Fix error message when assigning lists to singular properties
Also adjust the error message for the other compiler when trying to assign lists to script strings. Change-Id: I50f833c340f3634a59c5b36f30aeafc53003e65e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qqmlcodegenerator.cpp')
-rw-r--r--src/qml/compiler/qqmlcodegenerator.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmlcodegenerator.cpp b/src/qml/compiler/qqmlcodegenerator.cpp
index f3b92fd27f..aeb2e95c2d 100644
--- a/src/qml/compiler/qqmlcodegenerator.cpp
+++ b/src/qml/compiler/qqmlcodegenerator.cpp
@@ -994,6 +994,8 @@ void QQmlCodeGenerator::appendBinding(const AST::SourceLocation &nameLocation, q
if (isOnAssignment)
binding->flags |= QV4::CompiledData::Binding::IsOnAssignment;
+ if (isListItem)
+ binding->flags |= QV4::CompiledData::Binding::IsListItem;
binding->value.objectIndex = objectIndex;
QString error = bindingsTarget()->appendBinding(binding, isListItem, bindingToDefaultProperty);