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/types | |
| parent | 5d470f51214b273951cc7612ee018fc347716836 (diff) | |
Fix ownKey iteration over Proxy objects
Change-Id: I045a4844c06df9232cc8b04485ab0a39bb990e3f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 3 | ||||
| -rw-r--r-- | src/qml/types/qqmllistmodel_p_p.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 7509a63777..71b7328411 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1646,8 +1646,9 @@ PropertyKey ModelObjectOwnPropertyKeyIterator::next(const Object *o, Property *p return ObjectOwnPropertyKeyIterator::next(o, pd, attrs); } -OwnPropertyKeyIterator *ModelObject::virtualOwnPropertyKeys(const Object *) +OwnPropertyKeyIterator *ModelObject::virtualOwnPropertyKeys(const Object *m, Value *target) { + *target = *m; return new ModelObjectOwnPropertyKeyIterator; } diff --git a/src/qml/types/qqmllistmodel_p_p.h b/src/qml/types/qqmllistmodel_p_p.h index 46a41ac8c8..ff52ee049f 100644 --- a/src/qml/types/qqmllistmodel_p_p.h +++ b/src/qml/types/qqmllistmodel_p_p.h @@ -181,7 +181,7 @@ struct ModelObject : public QObjectWrapper protected: static bool virtualPut(Managed *m, PropertyKey id, const Value& value, Value *receiver); static ReturnedValue virtualGet(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty); - static OwnPropertyKeyIterator *virtualOwnPropertyKeys(const Object *m); + static OwnPropertyKeyIterator *virtualOwnPropertyKeys(const Object *m, Value *target); }; } // namespace QV4 |