feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Simplify QObject parent dumping

Browse Source 
Change-Id: I24fd6bf684a213c2e47978485442dd6c47073a7a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-12-09 15:23:07 +01:00
parent 11d079a0fe
commit c902974423
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
share/qtcreator/debugger/dumper.py
View File

@@ -1889,28 +1889,22 @@ class DumperBase():
if qobjectPtr: if qobjectPtr:
dd = self.extractPointer(qobjectPtr + ptrSize) dd = self.extractPointer(qobjectPtr + ptrSize)
if self.qtVersion() >= 0x50000: if self.qtVersion() >= 0x50000:
(dvtablePtr, qptr, parentPtr, childrenDPtr, flags, postedEvents, (dvtablePtr, qptr, parent, children, flags, postedEvents,
dynMetaObjectPtr, # Up to here QObjectData. dynMetaObjectPtr, # Up to here QObjectData.
extraData, threadDataPtr, connectionListsPtr, extraData, threadDataPtr, connectionListsPtr,
sendersPtr, currentSenderPtr) \ sendersPtr, currentSenderPtr) \
= self.split('ppppIIp' + 'ppppp', dd) = self.split('pp{@QObject*}{@QList<@QObject*>}IIp' + 'ppppp', dd)
else: else:
(dvtablePtr, qptr, parentPtr, childrenDPtr, flags, postedEvents, (dvtablePtr, qptr, parent, children, flags, postedEvents,
dynMetaObjectPtr, # Up to here QObjectData dynMetaObjectPtr, # Up to here QObjectData
objectName, extraData, threadDataPtr, connectionListsPtr, objectName, extraData, threadDataPtr, connectionListsPtr,
sendersPtr, currentSenderPtr) \ sendersPtr, currentSenderPtr) \
= self.split('ppppIIp' + 'pppppp', dd) = self.split('pp{@QObject*}{@QList<@QObject*>}IIp' + 'pppppp', dd)
if qobjectPtr:
qobjectType = self.createType('@QObject')
with SubItem(self, '[parent]'): with SubItem(self, '[parent]'):
if not self.isCli: if not self.isCli:
self.putSortGroup(9) self.putSortGroup(9)
if parentPtr: self.putItem(parent)
self.putItem(self.createValue(parentPtr, qobjectType))
else:
self.putValue('0x0')
self.putType('QObject *')
with SubItem(self, '[children]'): with SubItem(self, '[children]'):
if not self.isCli: if not self.isCli: