Fix QtDeclarative and QtQml co-existence part three ;( v5.2.0
authorSimon Hausmann <simon.hausmann@digia.com>
Fri, 6 Dec 2013 15:19:08 +0000 (16:19 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 6 Dec 2013 16:38:26 +0000 (17:38 +0100)
commit313a74cc4a9a5d200b2059d3d8767fe1a274c50d
tree8152c47ba79daf30c6853e4e95c84cf6d9178d93
parent7972553aca51587eb1dda80509ec66766e0743c2
Fix QtDeclarative and QtQml co-existence part three ;(

Unfortunately the QObject destroyed callbacks for QtQml and QtDeclarative can't
be called in sequence, because if the QQmlData has the ownsMemory bit set, then
the destroyed callback will delete the QQmlData, and the sub-sequent call to
the destroyed callback of qml1 will try to dereference the QQmlData's first bit
(ownedByQml1), which is already destroyed.

This patch fixes that by simply sharing the assumption of the first bit
indicating module ownership (QtQml vs. QtDeclarative) also to qtbase and using
it to distinguish between which destroyed callback function to call.

Task-number: QTCREATORBUG-10273

Change-Id: I2773a31a3e9b3a1c22d1c1f33b2f29f3296cb3cf
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h