1 files changed, 20 insertions, 7 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h
index 64cb1bb242..5f9cffb56d 100644
--- a/src/qml/qml/qqmljavascriptexpression_p.h
+++ b/src/qml/qml/qqmljavascriptexpression_p.h
@@ -54,7 +54,6 @@
 #include <QtCore/qglobal.h>
 #include <QtQml/qqmlerror.h>
 #include <private/qqmlengine_p.h>
-#include <private/qpointervaluepair_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -104,8 +103,7 @@ public:
     virtual QString expressionIdentifier() = 0;
     virtual void expressionChanged() = 0;
 
-    QV4::ReturnedValue evaluate(bool *isUndefined);
-    QV4::ReturnedValue evaluate(QV4::CallData *callData, bool *isUndefined);
+    void evaluate(QV4::CallData *callData, bool *isUndefined, QV4::Scope &scope);
 
     inline bool notifyOnValueChanged() const;
 
@@ -138,7 +136,8 @@ public:
     inline bool hasDelayedError() const;
     QQmlError error(QQmlEngine *) const;
     void clearError();
-    void clearGuards();
+    void clearActiveGuards();
+    void clearPermanentGuards();
     QQmlDelayedError *delayedError();
 
     static QV4::ReturnedValue evalFunction(QQmlContextData *ctxt, QObject *scope,
@@ -147,6 +146,14 @@ public:
 protected:
     void createQmlBinding(QQmlContextData *ctxt, QObject *scope, const QString &code, const QString &filename, quint16 line);
 
+    void cancelPermanentGuards() const
+    {
+        if (m_permanentDependenciesRegistered) {
+            for (QQmlJavaScriptExpressionGuard *it = permanentGuards.first(); it; it = permanentGuards.next(it))
+                it->cancelNotify();
+        }
+    }
+
 private:
     friend class QQmlContextData;
     friend class QQmlPropertyCapture;
@@ -159,10 +166,12 @@ private:
     //    activeGuards:flag2  - useSharedContext
     QBiPointer<QObject, DeleteWatcher> m_scopeObject;
     QForwardFieldList<QQmlJavaScriptExpressionGuard, &QQmlJavaScriptExpressionGuard::next> activeGuards;
+    QForwardFieldList<QQmlJavaScriptExpressionGuard, &QQmlJavaScriptExpressionGuard::next> permanentGuards;
 
     QQmlContextData *m_context;
     QQmlJavaScriptExpression **m_prevExpression;
     QQmlJavaScriptExpression  *m_nextExpression;
+    bool m_permanentDependenciesRegistered = false;
 
 protected:
     QV4::PersistentValue m_function;
@@ -179,10 +188,14 @@ public:
         Q_ASSERT(errorString == 0);
     }
 
-    void captureProperty(QQmlNotifier *);
-    void captureProperty(QObject *, int, int);
+    enum Duration {
+        OnlyOnce,
+        Permanently
+    };
 
-    static void registerQmlDependencies(QV4::ExecutionEngine *engine, const QV4::CompiledData::Function *compiledFunction);
+    static void registerQmlDependencies(const QV4::CompiledData::Function *compiledFunction, const QV4::Scope &scope);
+    void captureProperty(QQmlNotifier *, Duration duration = OnlyOnce);
+    void captureProperty(QObject *, int, int, Duration duration = OnlyOnce);
 
     QQmlEngine *engine;
     QQmlJavaScriptExpression *expression;