1 files changed, 11 insertions, 12 deletions

diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index 6034d3fdea..e3e5dff4d8 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -78,17 +78,10 @@ void QQmlExpressionPrivate::init(QQmlContextData *ctxt, const QString &expr, QOb
     expressionFunctionValid = false;
 }
 
-void QQmlExpressionPrivate::init(QQmlContextData *ctxt, const QString &expr,
-                                 QObject *me, const QString &srcUrl,
-                                 quint16 lineNumber, quint16 columnNumber)
+void QQmlExpressionPrivate::init(QQmlContextData *ctxt, QV4::Function *runtimeFunction, QObject *me)
 {
-    url = srcUrl;
-    line = lineNumber;
-    column = columnNumber;
-
-    expression = expr;
-
-    expressionFunctionValid = false;
+    expressionFunctionValid = true;
+    function = QV4::QmlBindingWrapper::createQmlCallableForFunction(QQmlEnginePrivate::getV4Engine(ctxt->engine), ctxt, me, runtimeFunction);
 
     QQmlAbstractExpression::setContext(ctxt);
     setScopeObject(me);
@@ -156,9 +149,9 @@ QQmlExpression::QQmlExpression(const QQmlScriptString &script, QQmlContext *ctxt
     if (!ctxt && (!scriptPrivate->context || !scriptPrivate->context->isValid()))
         return;
 
-    bool defaultConstruction = true;
     QQmlContextData *evalCtxtData = QQmlContextData::get(ctxt ? ctxt : scriptPrivate->context);
     QObject *scopeObject = scope ? scope : scriptPrivate->scope;
+    QV4::Function *runtimeFunction = 0;
 
     if (scriptPrivate->context) {
         QQmlContextData *ctxtdata = QQmlContextData::get(scriptPrivate->context);
@@ -171,13 +164,19 @@ QQmlExpression::QQmlExpression(const QQmlScriptString &script, QQmlContext *ctxt
                 d->url = cdata->name;
                 d->line = scriptPrivate->lineNumber;
                 d->column = scriptPrivate->columnNumber;
+
+                if (scriptPrivate->bindingId != QQmlBinding::Invalid)
+                    runtimeFunction = cdata->compilationUnit->runtimeFunctions.at(scriptPrivate->bindingId);
             }
 
             typeData->release();
         }
     }
 
-    if (defaultConstruction)
+    if (runtimeFunction) {
+        d->expression = scriptPrivate->script;
+        d->init(evalCtxtData, runtimeFunction, scopeObject);
+    } else
         d->init(evalCtxtData, scriptPrivate->script, scopeObject);
 }