diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-08 14:12:35 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-01-08 14:12:35 +0000 |
| commit | b7d55fa38441afa431481dd5c8d0aa2ff5f2c2cf (patch) | |
| tree | b06a205e47527abbd9902fed23199a0b82117bdd /src/qml/types | |
| parent | bfd1df3015404725d37a54bcb4ac3c24a87ce8c8 (diff) | |
| parent | 9a38fdcf8f9b734808bb54422e306872f3bfa944 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 967f89971d..2a1b11661e 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -1953,6 +1953,8 @@ void QQmlDelegateModelItem::destroyObject() Q_ASSERT(data); if (data->ownContext) { data->ownContext->clearContext(); + if (data->ownContext->contextObject == object) + data->ownContext->contextObject = nullptr; data->ownContext = 0; data->context = 0; } |