5 files changed, 14 insertions, 18 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 2a996f44c0..c895663586 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -190,7 +190,7 @@ void QQmlBinding::update(QQmlPropertyPrivate::WriteFlags flags)
 
             bool isUndefined = false;
 
-            QV4::ScopedValue result(scope, QQmlJavaScriptExpression::evaluate(context(), f, &isUndefined));
+            QV4::ScopedValue result(scope, QQmlJavaScriptExpression::evaluate(f, &isUndefined));
 
             bool needsErrorLocationData = false;
             if (!watcher.wasDeleted() && !hasError())
@@ -230,7 +230,7 @@ QVariant QQmlBinding::evaluate()
     bool isUndefined = false;
 
     QV4::ScopedValue f(scope, v4function.value());
-    QV4::ScopedValue result(scope, QQmlJavaScriptExpression::evaluate(context(), f, &isUndefined));
+    QV4::ScopedValue result(scope, QQmlJavaScriptExpression::evaluate(f, &isUndefined));
 
     ep->dereferenceScarceResources();
 
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index c24cfed2ff..5cfccd2f80 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -272,7 +272,7 @@ void QQmlBoundSignalExpression::evaluate(void **a)
             }
         }
 
-        QQmlJavaScriptExpression::evaluate(context(), f, callData, 0);
+        QQmlJavaScriptExpression::evaluate(f, callData, 0);
     }
     ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete.
 }
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index f84a5c2e16..b9843cabed 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -252,7 +252,7 @@ QV4::ReturnedValue QQmlExpressionPrivate::v4value(bool *isUndefined)
 
     QV4::Scope scope(v4);
     QV4::ScopedValue f(scope, function.value());
-    return evaluate(context(), f, isUndefined);
+    return evaluate(f, isUndefined);
 }
 
 QVariant QQmlExpressionPrivate::value(bool *isUndefined)
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 204f917e41..12594ae43a 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -140,22 +140,18 @@ void QQmlJavaScriptExpression::refresh()
 {
 }
 
-QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
-                                   const QV4::Value &function, bool *isUndefined)
+QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(const QV4::Value &function, bool *isUndefined)
 {
-    QV4::ExecutionEngine *v4 = QV8Engine::getV4(context->engine);
+    QV4::ExecutionEngine *v4 = QV8Engine::getV4(m_context->engine);
     QV4::Scope scope(v4);
     QV4::ScopedCallData callData(scope);
 
-    return evaluate(context, function, callData, isUndefined);
+    return evaluate(function, callData, isUndefined);
 }
 
-QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
-                                   const QV4::Value &function,
-                                   QV4::CallData *callData,
-                                   bool *isUndefined)
+QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(const QV4::Value &function, QV4::CallData *callData, bool *isUndefined)
 {
-    Q_ASSERT(context && context->engine);
+    Q_ASSERT(m_context && m_context->engine);
 
     if (function.isUndefined()) {
         if (isUndefined)
@@ -163,17 +159,17 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
         return QV4::Encode::undefined();
     }
 
-    QQmlEnginePrivate *ep = QQmlEnginePrivate::get(context->engine);
+    QQmlEnginePrivate *ep = QQmlEnginePrivate::get(m_context->engine);
 
     // All code that follows must check with watcher before it accesses data members
     // incase we have been deleted.
     DeleteWatcher watcher(this);
 
     Q_ASSERT(notifyOnValueChanged() || activeGuards.isEmpty());
-    GuardCapture capture(context->engine, this, &watcher);
+    GuardCapture capture(m_context->engine, this, &watcher);
 
     QQmlEnginePrivate::PropertyCapture *lastPropertyCapture = ep->propertyCapture;
-    ep->propertyCapture = notifyOnValueChanged()?&capture:0;
+    ep->propertyCapture = notifyOnValueChanged() ? &capture : 0;
 
 
     if (notifyOnValueChanged())
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h
index f9f304a524..80b9089f26 100644
--- a/src/qml/qml/qqmljavascriptexpression_p.h
+++ b/src/qml/qml/qqmljavascriptexpression_p.h
@@ -98,8 +98,8 @@ public:
     virtual QString expressionIdentifier() = 0;
     virtual void expressionChanged() = 0;
 
-    QV4::ReturnedValue evaluate(QQmlContextData *, const QV4::Value &function, bool *isUndefined);
-    QV4::ReturnedValue evaluate(QQmlContextData *, const QV4::Value &function, QV4::CallData *callData, bool *isUndefined);
+    QV4::ReturnedValue evaluate(const QV4::Value &function, bool *isUndefined);
+    QV4::ReturnedValue evaluate(const QV4::Value &function, QV4::CallData *callData, bool *isUndefined);
 
     inline bool notifyOnValueChanged() const;