aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-09-08 22:29:47 +0200
committerLars Knoll <lars.knoll@qt.io>2018-09-09 15:52:02 +0000
commit009a125d07448428a00abec70a894febe759adec (patch)
treec3c7411073517ce1931e4968f9928085d00782f6 /src/qml/qml/v8/qqmlbuiltinfunctions.cpp
parent5d470f51214b273951cc7612ee018fc347716836 (diff)
Fix ownKey iteration over Proxy objects
Change-Id: I045a4844c06df9232cc8b04485ab0a39bb990e3f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions.cpp')
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 60cd618e9f..e7899970ad 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -219,13 +219,13 @@ ReturnedValue QtObject::virtualGet(const Managed *m, PropertyKey id, const Value
return ret;
}
-OwnPropertyKeyIterator *QtObject::virtualOwnPropertyKeys(const Object *m)
+OwnPropertyKeyIterator *QtObject::virtualOwnPropertyKeys(const Object *m, Value *target)
{
auto that = static_cast<const QtObject*>(m);
if (!that->d()->isComplete())
const_cast<QtObject *>(that)->addAll();
- return Object::virtualOwnPropertyKeys(m);
+ return Object::virtualOwnPropertyKeys(m, target);
}
/*!