swh:1:snp:673156c31a876c5b99b2fe3e89615529de9a3c44
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
Tip revision: ed928cee1233aee003610d5fadb56bdaeffbd7b2 authored by Jake Petroules on 22 September 2016, 17:55:20 UTC
Suppress deprecated warnings for some QSysInfo members
Suppress deprecated warnings for some QSysInfo members
Tip revision: ed928ce
| File | Mode | Size |
|---|---|---|
| bin | ||
| config.tests | ||
| dist | ||
| doc | ||
| examples | ||
| lib | ||
| mkspecs | ||
| qmake | ||
| src | ||
| tests | ||
| tools | ||
| util | ||
| .gitattributes | -rw-r--r-- | 151 bytes |
| .gitignore | -rw-r--r-- | 7.2 KB |
| .qmake.conf | -rw-r--r-- | 207 bytes |
| .tag | -rw-r--r-- | 12 bytes |
| INSTALL | -rw-r--r-- | 574 bytes |
| LGPL_EXCEPTION.txt | -rw-r--r-- | 1.2 KB |
| LICENSE.FDL | -rw-r--r-- | 22.4 KB |
| LICENSE.GPL | -rw-r--r-- | 34.3 KB |
| LICENSE.LGPL | -rw-r--r-- | 26.2 KB |
| LICENSE.PREVIEW.COMMERCIAL | -rw-r--r-- | 30.8 KB |
| configure | -rwxr-xr-x | 226.0 KB |
| configure.bat | -rw-r--r-- | 3.7 KB |
| header.BSD | -rw-r--r-- | 2.0 KB |
| header.FDL | -rw-r--r-- | 1.2 KB |
| header.LGPL | -rw-r--r-- | 1.9 KB |
| header.LGPL-ONLY | -rw-r--r-- | 958 bytes |
| qtbase.pro | -rw-r--r-- | 7.3 KB |
| sync.profile | -rw-r--r-- | 3.0 KB |
Computing file changes ...
