diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 16:32:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 16:32:09 +0200 |
| commit | 4f0988c3907406087dbfdc193abfbf767678d814 (patch) | |
| tree | aafd9c98bb248d9920443778bf122ea23b1e4c75 /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | 32a980a86257021247a742b2b8c0b4aafe6e9035 (diff) | |
| parent | 01a9c006b0cb3f9ec7c140d25e6bfa3ca6250a4c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7bd70996e3372d154c6b0e47336baa22146667b0
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 8ba4b5eba1..cf0b823612 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -303,7 +303,7 @@ void QQmlPropertyCapture::registerQmlDependencies(QV4::ExecutionEngine *engine, if (!ep) return; QQmlPropertyCapture *capture = ep->propertyCapture; - if (!capture) + if (!capture || capture->watcher->wasDeleted()) return; QV4::Scope scope(engine); |