diff options
| author | hjk <hjk@qt.io> | 2020-12-07 09:56:53 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-12-09 08:50:48 +0000 |
| commit | ce2e8bd2fb3bbe4f12b960825b40565300001a64 (patch) | |
| tree | f7d154a81f1ae52e9cc13d089a4d9a54faaab974 /share | |
| parent | 4a0a466b7565407d31e3932ca03fac25e4fd6ea3 (diff) | |
Debugger: Adapt QJson dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I0bdfca1389763582072fd774b6288b9a855cf8cf
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/qttypes.py | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 1a8223aa26..b38f36a03b 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -3160,21 +3160,31 @@ def qdump__QJsonValue(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') qdumpHelper_QCbor_array(d, container_ptr, False) - return - - qdumpHelper_QJsonArray(d, value['d'].pointer(), value['a'].pointer()) + else: + qdumpHelper_QJsonArray(d, value['d'].pointer(), value['a'].pointer()) 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') qdumpHelper_QCbor_map(d, container_ptr, False) - return - - qdumpHelper_QJsonObject(d, value['d'].pointer(), value['o'].pointer()) + else: + qdumpHelper_QJsonObject(d, value['d'].pointer(), value['o'].pointer()) def qdump__QSqlResultPrivate(d, value): |