diff options
author | Lars Knoll <[email protected]> | 2014-03-10 15:18:54 +0100 |
---|---|---|
committer | The Qt Project <[email protected]> | 2014-03-10 21:00:22 +0100 |
commit | dfed088a50298fe4a9d0eb8a9d0a2711dfc206c1 (patch) | |
tree | 08b5ad6b162a2ca15e173aa190c961a89c5340b6 /src/qml/jsruntime/qv4arrayobject.cpp | |
parent | f67335fc340eafba04437e4b75ce9ac3edbffc54 (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 <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index efe1dff19c..3d710d2338 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -179,7 +179,7 @@ ReturnedValue ArrayPrototype::method_concat(CallContext *ctx) result->putIndexed(startIndex + i, entry); } } else { - result->arraySet(result->getLength(), ctx->callData->args[i]); + result->arraySet(result->getLength(), ValueRef(ctx->callData->args[i])); } } |