1 files changed, 1 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index f5d8106f06..35ed8fe0f3 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -362,16 +362,9 @@ void ExecutionContext::setProperty(const StringRef name, const ValueRef value)
             }
 
             if (activation) {
-                if (ctx->type == Type_QmlContext) {
+                if (ctx->type == Type_QmlContext || activation->hasOwnProperty(name)) {
                     activation->put(name, value);
                     return;
-                } else {
-                    PropertyAttributes attrs;
-                    Property *p = activation->__getOwnProperty__(name, &attrs);
-                    if (p) {
-                        activation->putValue(p, attrs, value);
-                        return;
-                    }
                 }
             }
         }