aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4arraydata.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-03-10 15:18:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-10 21:00:22 +0100
commitdfed088a50298fe4a9d0eb8a9d0a2711dfc206c1 (patch)
tree08b5ad6b162a2ca15e173aa190c961a89c5340b6 /src/qml/jsruntime/qv4arraydata.cpp
parentf67335fc340eafba04437e4b75ce9ac3edbffc54 (diff)
Fix copying of Property's
Data properties don't contain valid data in the set field if they are being stored in Objects. Thus we should never access that field unless we are dealing with accessor properties. Change-Id: I19dcbaee7ebd042ae24387f92a93571d75ca578a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
-rw-r--r--src/qml/jsruntime/qv4arraydata.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp
index 44727cba17..f03f5cd378 100644
--- a/src/qml/jsruntime/qv4arraydata.cpp
+++ b/src/qml/jsruntime/qv4arraydata.cpp
@@ -595,7 +595,7 @@ uint ArrayData::append(Object *obj, const ArrayObject *otherObj, uint n)
} else {
for (const SparseArrayNode *it = static_cast<const SparseArrayData *>(other)->sparse->begin();
it != static_cast<const SparseArrayData *>(other)->sparse->end(); it = it->nextNode())
- obj->arraySet(oldSize + it->key(), other->data[it->value]);
+ obj->arraySet(oldSize + it->key(), ValueRef(other->data[it->value]));
}
} else {
obj->arrayPut(oldSize, other->data, n);