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

Debugger: Make QByteArray, QString and QList dumper work with Qt dev

Browse Source 
Note that this is more a temporary workaround as there are more changes
to come (qsizetype instead of int for sizes, switch QList/QVector
aliasing).

Task-number: QTCREATORBUG-23806
Change-Id: Ic815fe293b1c4922276c127dec61930dc365acae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-06-15 09:39:15 +02:00
parent 3f3b56f3a7
commit 1c9194d2eb
1 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
share/qtcreator/debugger/qttypes.py
View File

@@ -55,11 +55,22 @@ def qedit__QByteArray(d, value, data):
def qdump__QByteArray(d, value):
if d.qtVersion() >= 0x60000:
dd, data, size = value.split('ppi')
_, _, alloc = d.split('iii', dd)
else:
data, size, alloc = d.byteArrayData(value)
d.check(alloc == 0 or (0 <= size and size <= alloc and alloc <= 100000000))
if size > 0:
d.putExpandable()
if d.qtVersion() >= 0x60000:
elided, shown = d.computeLimit(size, d.displayStringLimit)
p = d.readMemory(data, shown)
else:
elided, p = d.encodeByteArrayHelper(d.extractPointer(value), d.displayStringLimit)
displayFormat = d.currentItemFormat()
if displayFormat == DisplayFormat.Automatic or displayFormat == DisplayFormat.Latin1String:
d.putValue(p, 'latin1', elided=elided)
@@ -965,6 +976,7 @@ def qform__QList():
def qdump__QList(d, value):
inner_type = value.type.ltarget[0] if value.type.code == TypeCode.Typedef else value.type[0]
return qdumpHelper_QList(d, value, value.type[0])
@@ -973,6 +985,12 @@ def qdump__QVariantList(d, value):
def qdumpHelper_QList(d, value, innerType):
if d.qtVersion() >= 0x60000:
dd, data, size = value.split('ppi')
_, _, alloc = d.split('iii', dd)
d.putItemCount(size)
d.putPlotData(data, size, innerType)
return
base = d.extractPointer(value)
(ref, alloc, begin, end) = d.split('IIII', base)
array = base + 16
@@ -1536,6 +1554,13 @@ def qform__QString():
def qdump__QString(d, value):
if d.qtVersion() >= 0x60000:
dd, data, size = value.split('ppi')
_, _, alloc = d.split('iii', dd)
elided, shown = d.computeLimit(2 * size, d.displayStringLimit)
p = d.readMemory(data, shown)
d.putValue(p, 'utf16', elided=elided)
else:
d.putStringValue(value)
(data, size, alloc) = d.stringData(value)
displayFormat = d.currentItemFormat()
@@ -1999,6 +2024,10 @@ def qform__QVector():
def qdump__QVector(d, value):
if d.qtVersion() >= 0x060000:
dd, data, size = value.split('ppi')
_, _, alloc = d.split('iii', dd)
else:
dd = d.extractPointer(value)
data, size, alloc = d.vectorDataHelper(dd)
d.check(0 <= size and size <= alloc and alloc <= 1000 * 1000 * 1000)