diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-08-03 10:06:52 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-04 09:16:33 +0000 |
| commit | 895a3f08b4feade6b377c1818a7fff9b0b1052c6 (patch) | |
| tree | 9dfef5030e3e7720282791e4585c396db095be02 /src/qml/jsapi | |
| parent | 18376523d495597bbe009cf20d783816c9f3a44a (diff) | |
Implement support for ownKeys in Proxy objects
Change-Id: I7edee88e4252e6ed0d2666c3f633bb595cb0e831
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsvalueiterator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsvalueiterator.cpp b/src/qml/jsapi/qjsvalueiterator.cpp index 5add9d4b0a..89caf705df 100644 --- a/src/qml/jsapi/qjsvalueiterator.cpp +++ b/src/qml/jsapi/qjsvalueiterator.cpp @@ -71,7 +71,7 @@ void QJSValueIteratorPrivate::init(const QJSValue &v) void QJSValueIteratorPrivate::next() { QV4::Object *o = object.as<QV4::Object>(); - if (!o) + if (!o || !iterator) return; QV4::PropertyKey key; @@ -86,7 +86,7 @@ void QJSValueIteratorPrivate::next() bool QJSValueIteratorPrivate::isValid() const { - if (!engine) + if (!engine || !iterator) return false; QV4::Value *val = object.valueRef(); return (val && val->isObject()); |