Move m_function into the base class

Change-Id: I2ebc0ac8f5085157f5d1ec71a1b75559c6a46f8b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h
index 80b9089f26..f846b6570f 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(const QV4::Value &function, bool *isUndefined);
-    QV4::ReturnedValue evaluate(const QV4::Value &function, QV4::CallData *callData, bool *isUndefined);
+    QV4::ReturnedValue evaluate(bool *isUndefined);
+    QV4::ReturnedValue evaluate(QV4::CallData *callData, bool *isUndefined);
 
     inline bool notifyOnValueChanged() const;
 
@@ -181,6 +181,8 @@ private:
     QQmlJavaScriptExpression **m_prevExpression;
     QQmlJavaScriptExpression  *m_nextExpression;
 
+protected:
+    QV4::PersistentValue m_function;
 };
 
 QQmlJavaScriptExpression::DeleteWatcher::DeleteWatcher(QQmlJavaScriptExpression *e)