diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-09-08 23:07:31 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-09 15:52:10 +0000 |
| commit | bcc9aa7daf197e8f2befe215902443d608e07b6a (patch) | |
| tree | 89d077b637c683e5b8add795e0b8ba2089dc4a3d /src/qml/jsruntime/qv4objectiterator.cpp | |
| parent | 166fc4d84729fee683a9ea6b2c27cf51dc5f1c9d (diff) | |
Include symbols in getOwnPropertyKeys
And fix getOwnPropertySymbols and getOwnPropertyDescriptors.
Change-Id: Ie0e4c3d308ffe8a904e9a6ab9242b2cda59d779f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4objectiterator.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index 906f6b38a6..e529b8e86b 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -66,7 +66,8 @@ PropertyKey ObjectIterator::next(Property *pd, PropertyAttributes *attrs) object = nullptr; return key; } - if (key->isSymbol() || ((flags & EnumerableOnly) && !attrs->isEnumerable())) + if ((!(flags & WithSymbols) && key->isSymbol()) || + ((flags & EnumerableOnly) && !attrs->isEnumerable())) continue; return key; } |