aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-01-08 12:46:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-20 21:13:43 +0100
commit50d6e51c73a37858699b90d64657cec5e0b53610 (patch)
treeff56a6973b360186f81f2c22eda7c1bc750ebab6 /src/qml/jsapi
parentf5cde6dbd8ecea7c8c4b9e48f0e7d217fb24149b (diff)
clean up Object::has(Own)Property
hasProperty is now implemented by calling hasOwnProperty on the proto chain. In addition, it should be slightly faster and doesn't use API that returns a Property pointer anymore. Change-Id: I6312d83ccfed3f0a1a8ec4c72c436a426d6eab44 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi')
-rw-r--r--src/qml/jsapi/qjsvalue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 8e1ac38f4f..0734e92b19 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -1028,7 +1028,7 @@ bool QJSValue::hasProperty(const QString &name) const
return false;
ScopedString s(scope, engine->newIdentifier(name));
- return o->__hasProperty__(s);
+ return o->hasProperty(s);
}
/*!