Revision 313a74cc4a9a5d200b2059d3d8767fe1a274c50d authored by Simon Hausmann on 06 December 2013, 15:19:08 UTC, committed by The Qt Project on 06 December 2013, 16:38:26 UTC
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>
1 parent 7972553
History
File Mode Size
auto
baselineserver
benchmarks
global
manual
shared
README -rw-r--r-- 786 bytes
tests.pro -rw-r--r-- 244 bytes

README

back to top