Smaller cleanup to QQmlJavaScriptExpression

Clean up some of the code to create binding expressions.

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

5 files changed, 11 insertions, 21 deletions

diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index fdbecec129..b0ccf9ac59 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -58,8 +58,7 @@ QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContext *ctxt)
     QQmlJavaScriptExpression::setContext(QQmlContextData::get(ctxt));
     setScopeObject(obj);
 
-    QV4::ExecutionEngine *v4 = QQmlEnginePrivate::get(context()->engine)->v4engine();
-    m_function.set(v4, qmlBinding(context(), obj, str, QString(), 0));
+    createQmlBinding(context(), obj, str, QString(), 0);
 }
 
 QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlContext *ctxt)
@@ -93,7 +92,7 @@ QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlConte
         m_function.set(v4, QV4::QmlBindingWrapper::createQmlCallableForFunction(ctxtdata, scopeObject(), runtimeFunction));
     } else {
         QString code = scriptPrivate->script;
-        m_function.set(v4, qmlBinding(context(), scopeObject(), code, url, scriptPrivate->lineNumber));
+        createQmlBinding(context(), scopeObject(), code, url, scriptPrivate->lineNumber);
     }
 }
 
@@ -105,8 +104,7 @@ QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContextData *ctxt
     QQmlJavaScriptExpression::setContext(ctxt);
     setScopeObject(obj);
 
-    QV4::ExecutionEngine *v4 = QQmlEnginePrivate::get(context()->engine)->v4engine();
-    m_function.set(v4, qmlBinding(ctxt, obj, str, QString(), 0));
+    createQmlBinding(ctxt, obj, str, QString(), 0);
 }
 
 QQmlBinding::QQmlBinding(const QString &str, QObject *obj,
@@ -120,8 +118,7 @@ QQmlBinding::QQmlBinding(const QString &str, QObject *obj,
     QQmlJavaScriptExpression::setContext(ctxt);
     setScopeObject(obj);
 
-    QV4::ExecutionEngine *v4 = QQmlEnginePrivate::get(context()->engine)->v4engine();
-    m_function.set(v4, qmlBinding(ctxt, obj, str, url, lineNumber));
+    createQmlBinding(ctxt, obj, str, url, lineNumber);
 }
 
 QQmlBinding::QQmlBinding(const QV4::Value &functionPtr, QObject *obj, QQmlContextData *ctxt)
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index e4a36f7580..332b99ee8f 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -241,12 +241,8 @@ void QQmlExpression::setExpression(const QString &expression)
 // Must be called with a valid handle scope
 QV4::ReturnedValue QQmlExpressionPrivate::v4value(bool *isUndefined)
 {
-    Q_Q(QQmlExpression);
-
-    QV4::ExecutionEngine *v4 = QQmlEnginePrivate::get(q->engine())->v4engine();
-
     if (!expressionFunctionValid) {
-        m_function.set(v4, qmlBinding(context(), scopeObject(), expression, url, line));
+        createQmlBinding(context(), scopeObject(), expression, url, line);
         expressionFunctionValid = true;
     }
 
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index a45ba680e5..5f30eac066 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -342,8 +342,8 @@ QQmlJavaScriptExpression::evalFunction(QQmlContextData *ctxt, QObject *scopeObje
     return result->asReturnedValue();
 }
 
-QV4::ReturnedValue QQmlJavaScriptExpression::qmlBinding(QQmlContextData *ctxt, QObject *qmlScope,
-                                                       const QString &code, const QString &filename, quint16 line)
+void QQmlJavaScriptExpression::createQmlBinding(QQmlContextData *ctxt, QObject *qmlScope,
+                                          const QString &code, const QString &filename, quint16 line)
 {
     QQmlEngine *engine = ctxt->engine;
     QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine);
@@ -367,9 +367,9 @@ QV4::ReturnedValue QQmlJavaScriptExpression::qmlBinding(QQmlContextData *ctxt, Q
             error.setUrl(QUrl::fromLocalFile(filename));
         error.setObject(qmlScope);
         ep->warning(error);
-        return QV4::Encode::undefined();
+        result = QV4::Encode::undefined();
     }
-    return result->asReturnedValue();
+    m_function.set(v4, result);
 }
 
 
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h
index 24e9878aa2..dfcf8b2d68 100644
--- a/src/qml/qml/qqmljavascriptexpression_p.h
+++ b/src/qml/qml/qqmljavascriptexpression_p.h
@@ -138,10 +138,8 @@ public:
     static QV4::ReturnedValue evalFunction(QQmlContextData *ctxt, QObject *scope,
                                                      const QString &code, const QString &filename,
                                                      quint16 line);
-    // doesn't require rewriting the expression
-    static QV4::ReturnedValue qmlBinding(QQmlContextData *ctxt, QObject *scope,
-                                        const QString &code,
-                                        const QString &filename, quint16 line);
+protected:
+    void createQmlBinding(QQmlContextData *ctxt, QObject *scope, const QString &code, const QString &filename, quint16 line);
 
 private:
     friend class QQmlContextData;
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp
index 524ee02952..6027a6ddc1 100644
--- a/src/quick/qtquick2.cpp
+++ b/src/quick/qtquick2.cpp
@@ -133,7 +133,6 @@ void QQmlQtQuick2DebugStatesDelegate::updateBinding(QQmlContext *context,
                                                  QQmlContextData::get(context), fileName,
                                                  line, column);
                     newBinding->setTarget(property);
-                    newBinding->setNotifyOnValueChanged(true);
                 }
 
                 state->changeBindingInRevertList(object, propertyName, newBinding);