diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-08-02 16:16:09 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-08-02 20:25:49 +0000 |
commit | 0d63c22eee293fe59d7691608deaaf3468045eb3 (patch) | |
tree | e54d53a183d91efc8e4e7089d4bbc5964f4badce /src/qml/qml/qqmlcomponent.cpp | |
parent | 0754f55287f4652382332bce42cd8c7d27846ef1 (diff) |
Remove support for iterating over the proto chain from ObjectIterator
This will simplify moving over to the new iteration model. It implies
a very small behavioral change in a few places where we used to
iterate over the proto chain before.
Change-Id: Ia62c9c51712d6b45e69ca63becdbefab6fa4bf3f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 6a6e5e8d68..45b0f18530 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1223,7 +1223,7 @@ void QQmlComponentPrivate::setInitialProperties(QV4::ExecutionEngine *engine, QV QV4::Scope scope(engine); QV4::ScopedObject object(scope); QV4::ScopedObject valueMap(scope, v); - QV4::ObjectIterator it(scope, valueMap, QV4::ObjectIterator::EnumerableOnly|QV4::ObjectIterator::WithProtoChain); + QV4::ObjectIterator it(scope, valueMap, QV4::ObjectIterator::EnumerableOnly); QV4::ScopedString name(scope); QV4::ScopedValue val(scope); if (engine->hasException) |