Debugger: Fix some dumpers with namespaced Qt

This makes the use of '@' prefixes in split('{@QString}'...) etc
mandatory, thereby removing the guessing on whether namespaces apply
or not on the dumper 'core' side, and removes the guessing on
whether dropping the '@' 'works' on the individual dumper implementation
side.

Amends 1074c2ffce.

Change-Id: I44611eb09557638dec12d2e2f78cdaeac0bbd449
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-11-30 15:25:30 +01:00
parent cfacbb773b
commit e1790ed9d0
3 changed files with 47 additions and 47 deletions
+3 -3
View File
@@ -1902,7 +1902,7 @@ class DumperBase():
= self.split('ppppIIp' + 'pppppp', dd)
if qobjectPtr:
qobjectType = self.createType('QObject')
qobjectType = self.createType('@QObject')
with SubItem(self, '[parent]'):
if not self.isCli:
self.putSortGroup(9)
@@ -2063,8 +2063,8 @@ class DumperBase():
# Dynamic properties.
if extraData:
byteArrayType = self.createType('QByteArray')
variantType = self.createType('QVariant')
byteArrayType = self.createType('@QByteArray')
variantType = self.createType('@QVariant')
if self.qtVersion() >= 0x50600:
values = self.vectorChildrenGenerator(
extraData + 2 * ptrSize, variantType)