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

Debugger: Adapt QJson dumper to Qt6

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I0bdfca1389763582072fd774b6288b9a855cf8cf
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2020-12-07 09:56:53 +01:00
parent 4a0a466b75
commit ce2e8bd2fb
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3160,21 +3160,31 @@ def qdump__QJsonValue(d, value):
def qdump__QJsonArray(d, value): def qdump__QJsonArray(d, value):
if d.qtVersion() >= 0x050f00: if d.qtVersion() >= 0x060000:
dptr = d.extractPointer(value)
if not dptr:
d.putItemCount(0)
else:
qdumpHelper_QCbor_array(d, dptr, False)
elif d.qtVersion() >= 0x050f00:
_, container_ptr = value.split('pp') _, container_ptr = value.split('pp')
qdumpHelper_QCbor_array(d, container_ptr, False) qdumpHelper_QCbor_array(d, container_ptr, False)
return else:
qdumpHelper_QJsonArray(d, value['d'].pointer(), value['a'].pointer())
qdumpHelper_QJsonArray(d, value['d'].pointer(), value['a'].pointer())
def qdump__QJsonObject(d, value): def qdump__QJsonObject(d, value):
if d.qtVersion() >= 0x050f00: if d.qtVersion() >= 0x060000:
dptr = d.extractPointer(value)
if not dptr:
d.putItemCount(0)
else:
qdumpHelper_QCbor_map(d, dptr, False)
elif d.qtVersion() >= 0x050f00:
_, container_ptr = value.split('pp') _, container_ptr = value.split('pp')
qdumpHelper_QCbor_map(d, container_ptr, False) qdumpHelper_QCbor_map(d, container_ptr, False)
return else:
qdumpHelper_QJsonObject(d, value['d'].pointer(), value['o'].pointer())
qdumpHelper_QJsonObject(d, value['d'].pointer(), value['o'].pointer())
def qdump__QSqlResultPrivate(d, value): def qdump__QSqlResultPrivate(d, value):

2
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -7597,7 +7597,7 @@ void tst_Dumpers::dumper_data()
const QtVersion jsonv1{0, 0x50f00}; const QtVersion jsonv1{0, 0x50f00};
const QtVersion jsonv2{0x50f00}; const QtVersion jsonv2{0x50f00, 0x60000};
QTest::newRow("QJson") QTest::newRow("QJson")
<< Data("#include <QString>\n" << Data("#include <QString>\n"