Fix Object::getOwnProperty API

Don't return a Proprety pointer, this has issues with
StringObject. Instead pass in a pointer that will get filled
with the correct data.

Change-Id: I28536ca129f5be3a4a1bc9583223521458411195
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
index 9b921b9fad..6fbfc844c8 100644
--- a/src/qml/qml/qqmlcontextwrapper.cpp
+++ b/src/qml/qml/qqmlcontextwrapper.cpp
@@ -278,10 +278,9 @@ void QmlContextWrapper::put(Managed *m, String *name, const Value &value)
         return;
     QV4::Scoped<QmlContextWrapper> wrapper(scope, resource);
 
-    PropertyAttributes attrs;
-    Property *pd  = wrapper->__getOwnProperty__(name, &attrs);
-    if (pd) {
-        wrapper->putValue(pd, attrs, value);
+    uint member = wrapper->internalClass()->find(name);
+    if (member < UINT_MAX) {
+        wrapper->putValue(wrapper->propertyAt(member), wrapper->internalClass()->propertyData[member], value);
         return;
     }