diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-05-03 19:55:42 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-18 08:51:35 +0000 |
commit | 66fa2b979632d87f0ac9b3f1455df66411984670 (patch) | |
tree | dc723a2580c4cc99e2349801cdb98efa75024c17 /src/qml/qml/qqmlengine.cpp | |
parent | 3488569817c8cf4bbfbdc95f0e0f6bfab3d9ab3e (diff) |
Save another pointer in QQmlBoundSignal
isEvaluating is not really needed as it's tightly coupled
to the isNotifying flag in the parent class. Use that instead,
to get rid of it.
Change-Id: Ic7274ac54e4d380567522c8a549b98d5ed1a1798
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index a1b512bbae..a866a33787 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1670,7 +1670,7 @@ void QQmlData::destroyed(QObject *object) QQmlBoundSignal *signalHandler = signalHandlers; while (signalHandler) { - if (signalHandler->isEvaluating()) { + if (signalHandler->isNotifying()) { // The object is being deleted during signal handler evaluation. // This will cause a crash due to invalid memory access when the // evaluation has completed. |