diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-08-30 12:35:36 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-08-31 08:25:47 +0000 |
| commit | c13aa48d4cad8659af2b491e4b3ddbe46b38fcc5 (patch) | |
| tree | dc601d09dfba3cd2897ca9f880166abe7fcd5910 /src/qml/qml/qqmljavascriptexpression_p.h | |
| parent | 88c37194b2168fb9f915aaaf07d3bfbc5dc8be3d (diff) | |
QML: treat permanent guards more like active guardsv5.8.0-alpha1
Esp. when disabling notifications and marking notifiers as "done".
Change-Id: I2d1c3bf048b32f68680744250e4250c3c4d76660
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index a5c7a80153..5f9cffb56d 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -146,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; |