diff options
| author | Nick Shaforostov <mshaforostov@airmusictech.com> | 2019-11-26 18:51:51 +0100 |
|---|---|---|
| committer | Nick Shaforostov <mshaforostov@airmusictech.com> | 2019-11-27 11:20:16 +0000 |
| commit | 3027d1369987cd03391cf645bd517ec5e33a18d8 (patch) | |
| tree | 0c0535c4c947a57eae1ceb19f2215dcfe3c9287e /src/qml/qml/qqmldata_p.h | |
| parent | 0012f8bd152a36a67abc696465f27d612625b5d9 (diff) | |
QQmlData::wasDeleted now returns true also in case of isDeletingChildren
without this check, ddata below can be NULL in this case, and
(ddata && ddata->isQueuedForDeletion) will return false,
while isDeletingChildren being true would imply wasDeleted should return true
Change-Id: I6113c2cf972f7d418a3dbc2fd77ee6550c91aa93
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmldata_p.h')
| -rw-r--r-- | src/qml/qml/qqmldata_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h index 299476f5c8..ee31cb38d9 100644 --- a/src/qml/qml/qqmldata_p.h +++ b/src/qml/qml/qqmldata_p.h @@ -335,7 +335,7 @@ bool QQmlData::wasDeleted(const QObject *object) return true; const QObjectPrivate *priv = QObjectPrivate::get(object); - if (!priv || priv->wasDeleted) + if (!priv || priv->wasDeleted || priv->isDeletingChildren) return true; const QQmlData *ddata = QQmlData::get(object); |