diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:10 +0200 |
| commit | 79349119c66c2237d70fe4c13ebb9fe273ce2f85 (patch) | |
| tree | 4cfa3561f188a3904496cef330c79c1a687436ed /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | bf3b596066af733c04b5ed3ef2dc9ec753a41e79 (diff) | |
| parent | 4f0988c3907406087dbfdc193abfbf767678d814 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 5d96240e5b..4b54123892 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -301,7 +301,7 @@ void QQmlPropertyCapture::registerQmlDependencies(const QV4::CompiledData::Funct if (!ep) return; QQmlPropertyCapture *capture = ep->propertyCapture; - if (!capture) + if (!capture || capture->watcher->wasDeleted()) return; if (capture->expression->m_permanentDependenciesRegistered) |