implement AutoCreateDynamicProperties option

1 files changed, 7 insertions, 7 deletions

diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index e668df3..3705e5f 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -1314,13 +1314,6 @@ void QObjectDelegate::put(QScriptObject *object, JSC::ExecState* exec,
         }
     }
 
-    index = qobject->dynamicPropertyNames().indexOf(name);
-    if (index != -1) {
-        QVariant v = eng->scriptValueFromJSCValue(value).toVariant();
-        (void)qobject->setProperty(name, v);
-        return;
-    }
-
     const int offset = (opt & QScriptEngine::ExcludeSuperClassMethods)
                        ? meta->methodOffset() : 0;
     for (index = meta->methodCount() - 1; index >= offset; --index) {
@@ -1332,6 +1325,13 @@ void QObjectDelegate::put(QScriptObject *object, JSC::ExecState* exec,
         }
     }
 
+    index = qobject->dynamicPropertyNames().indexOf(name);
+    if ((index != -1) || (opt & QScriptEngine::AutoCreateDynamicProperties)) {
+        QVariant v = eng->scriptValueFromJSCValue(value).toVariant();
+        (void)qobject->setProperty(name, v);
+        return;
+    }
+
     QScriptObjectDelegate::put(object, exec, propertyName, value, slot);
 }