diff options
| author | David Schulz <david.schulz@qt.io> | 2021-01-11 13:34:57 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2021-01-14 08:49:07 +0000 |
| commit | b7758eebb2a02a7bc5a808f2562b7a6624592b32 (patch) | |
| tree | 69150bbe3bd4073c4981342708ea9634885e99e8 | |
| parent | 6ae71652a503e64e129172f0c799d26ca7b10569 (diff) | |
Dumper: Fix std dumper for release builds
for std::map, std::set and std::list
Fixes: QTCREATORBUG-24901
Change-Id: Ibfb196b17b7270729b052ed27dd51786cb2f8db8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | share/qtcreator/debugger/stdtypes.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py index a3cc6f2c97..3a8c443ac0 100644 --- a/share/qtcreator/debugger/stdtypes.py +++ b/share/qtcreator/debugger/stdtypes.py @@ -242,7 +242,11 @@ def qdump__std__list(d, value): def qdump__std__list__QNX(d, value): - (proxy, head, size) = value.split("ppp") + try: + _ = value["_Mypair"]["_Myval2"]["_Myproxy"] + (proxy, head, size) = value.split("ppp") + except Exception: + (head, size) = value.split("pp") d.putItemCount(size, 1000) if d.isExpanded(): @@ -330,7 +334,11 @@ def qdump__std__map(d, value): def qdump_std__map__helper(d, value): - (proxy, head, size) = value.split("ppp") + try: + _ = value["_Mypair"]["_Myval2"]["_Myval2"]["_Myproxy"] + (proxy, head, size) = value.split("ppp") + except Exception: + (head, size) = value.split("pp") d.check(0 <= size and size <= 100 * 1000 * 1000) d.putItemCount(size) if d.isExpanded(): @@ -505,7 +513,11 @@ def qdump__std__set(d, value): def qdump__std__set__QNX(d, value): - (proxy, head, size) = value.split("ppp") + try: + _ = value["_Mypair"]["_Myval2"]["_Myval2"]["_Myproxy"] + (proxy, head, size) = value.split("ppp") + except Exception: + (head, size) = value.split("pp") d.check(0 <= size and size <= 100 * 1000 * 1000) d.putItemCount(size) if d.isExpanded(): |