aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4proxy.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-09-08 12:27:15 +0200
committerLars Knoll <lars.knoll@qt.io>2018-09-08 16:51:16 +0000
commit5d470f51214b273951cc7612ee018fc347716836 (patch)
treee6ae9e7f93b3dca3d307fe55de3c348223f816bc /src/qml/jsruntime/qv4proxy.cpp
parentf726c56ce8ca5cfae510d8b81b44ad816f6ad245 (diff)
Fix some bugs in Proxy::virtualGetOwnProperty
Change-Id: I28c32f2bfdac8848baf82905fb04790f29451805 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4proxy.cpp')
-rw-r--r--src/qml/jsruntime/qv4proxy.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4proxy.cpp b/src/qml/jsruntime/qv4proxy.cpp
index 19e46304af..895763d40e 100644
--- a/src/qml/jsruntime/qv4proxy.cpp
+++ b/src/qml/jsruntime/qv4proxy.cpp
@@ -275,7 +275,7 @@ PropertyAttributes ProxyObject::virtualGetOwnProperty(Managed *m, PropertyKey id
ScopedProperty resultDesc(scope);
PropertyAttributes resultAttributes;
ObjectPrototype::toPropertyDescriptor(scope.engine, trapResult, resultDesc, &resultAttributes);
- resultDesc->fullyPopulated(&resultAttributes);
+ resultDesc->completed(&resultAttributes);
if (!targetDesc->isCompatible(targetAttributes, resultDesc, resultAttributes)) {
scope.engine->throwTypeError();
@@ -283,7 +283,7 @@ PropertyAttributes ProxyObject::virtualGetOwnProperty(Managed *m, PropertyKey id
}
if (!resultAttributes.isConfigurable()) {
- if (targetAttributes == Attr_Invalid || !targetAttributes.isConfigurable()) {
+ if (targetAttributes == Attr_Invalid || targetAttributes.isConfigurable()) {
scope.engine->throwTypeError();
return Attr_Invalid;
}