Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec

1 files changed, 22 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index f2acc7352c..9879763c72 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -245,6 +245,28 @@ void QQmlBoundSignalExpression::evaluate(void **a)
     ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete.
 }
 
+void QQmlBoundSignalExpression::evaluate(const QList<QVariant> &args)
+{
+    Q_ASSERT (context() && engine());
+
+    if (!expressionFunctionValid())
+        return;
+
+    QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine());
+    QV4::Scope scope(ep->v4engine());
+
+    ep->referenceScarceResources(); // "hold" scarce resources in memory during evaluation.
+
+    QV4::ScopedCallData callData(scope, args.count());
+    for (int ii = 0; ii < args.count(); ++ii) {
+        callData->args[ii] = scope.engine->fromVariant(args[ii]);
+    }
+
+    QQmlJavaScriptExpression::evaluate(callData, 0);
+
+    ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete.
+}
+
 ////////////////////////////////////////////////////////////////////////