Don't double function'ize dynamic QML functions

2 files changed, 16 insertions, 4 deletions

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 3b2009a..7d93c46 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -2355,6 +2355,8 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode)
         ((QmlVMEMetaData *)dynamicData.data())->signalCount++;
     }
 
+    QStringList funcScripts;
+
     for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) {
         Object::DynamicSlot &s = obj->dynamicSlots[ii];
         QByteArray sig(s.name + '(');
@@ -2372,7 +2374,7 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode)
         funcScript.append(QLatin1Char(')'));
         funcScript.append(s.body);
         funcScript.append(QLatin1Char(')'));
-        s.body = funcScript;
+        funcScripts << funcScript;
 
         QMetaMethodBuilder b = builder.addSlot(sig);
         b.setReturnType("QVariant");
@@ -2380,20 +2382,21 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode)
 
         ((QmlVMEMetaData *)dynamicData.data())->methodCount++;
         QmlVMEMetaData::MethodData methodData =
-             { s.parameterNames.count(), 0, s.body.length(), 0 };
+             { s.parameterNames.count(), 0, funcScript.length(), 0 };
 
         dynamicData.append((char *)&methodData, sizeof(methodData));
     }
 
     for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) {
         const Object::DynamicSlot &s = obj->dynamicSlots.at(ii);
+        const QString &funcScript = funcScripts.at(ii);
         QmlVMEMetaData::MethodData *data =
             ((QmlVMEMetaData *)dynamicData.data())->methodData() + ii;
 
         data->bodyOffset = dynamicData.size();
 
-        dynamicData.append((const char *)s.body.constData(),
-                           (s.body.length() * sizeof(QChar)));
+        dynamicData.append((const char *)funcScript.constData(),
+                           (funcScript.length() * sizeof(QChar)));
     }
 
     obj->metadata = builder.toRelocatableData();
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.5.qml b/tests/auto/declarative/qmlecmascript/data/methods.5.qml
new file mode 100644
index 0000000..3d45b15
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/methods.5.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+Item {
+    property alias x: item.x
+    Item { id: item }
+
+    function testFunction() { return 9; }
+    property int test: testFunction();
+}