diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-09-08 22:29:47 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-09 15:52:02 +0000 |
commit | 009a125d07448428a00abec70a894febe759adec (patch) | |
tree | c3c7411073517ce1931e4968f9928085d00782f6 /src/qml/jsruntime/qv4sequenceobject.cpp | |
parent | 5d470f51214b273951cc7612ee018fc347716836 (diff) | |
download | qtdeclarative-009a125d07448428a00abec70a894febe759adec.tar.gz |
Fix ownKey iteration over Proxy objects
Change-Id: I045a4844c06df9232cc8b04485ab0a39bb990e3f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4sequenceobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index da5aa17719..1eef12a491 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -369,8 +369,9 @@ public: } }; - static OwnPropertyKeyIterator *containerOwnPropertyKeys(const Object *) + static OwnPropertyKeyIterator *containerOwnPropertyKeys(const Object *m, Value *target) { + *target = *m; return new OwnPropertyKeyIterator; } @@ -596,8 +597,8 @@ public: } static bool virtualIsEqualTo(Managed *that, Managed *other) { return static_cast<QQmlSequence<Container> *>(that)->containerIsEqualTo(other); } - static QV4::OwnPropertyKeyIterator *virtualOwnPropertyKeys(const Object *m) - { return static_cast<const QQmlSequence<Container> *>(m)->containerOwnPropertyKeys(m);} + static QV4::OwnPropertyKeyIterator *virtualOwnPropertyKeys(const Object *m, Value *target) + { return static_cast<const QQmlSequence<Container> *>(m)->containerOwnPropertyKeys(m, target);} }; |