diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-07-03 11:36:55 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2020-07-06 09:37:21 +0000 |
| commit | e3312205ed2fda1af25e70562ebbafa42b3ce7f8 (patch) | |
| tree | 496858136226a15e87734f47bbb0e9184d7dbdba /share | |
| parent | 11a7ccb8651565945c4ca86e7a71412437a97723 (diff) | |
Dumper: Adapt to Id that moved from Core to Utils
Change-Id: I6437d813234dc22923a313d540f115e070edeba7
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/cdbbridge.py | 5 | ||||
| -rw-r--r-- | share/qtcreator/debugger/creatortypes.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py index f73140dc0fb..aa76d698920 100644 --- a/share/qtcreator/debugger/cdbbridge.py +++ b/share/qtcreator/debugger/cdbbridge.py @@ -514,7 +514,10 @@ class Dumper(DumperBase): raise Exception("cdb does not support calling functions") def nameForCoreId(self, id): - idName = cdbext.call('Cored4!Core::nameForId(%d)' % id) + for dll in ['Utilsd4', 'Utils4']: + idName = cdbext.call('%s!Utils::nameForId(%d)' % (dll, id)) + if idName is not None: + break return self.fromNativeValue(idName) def putCallItem(self, name, rettype, value, func, *args): diff --git a/share/qtcreator/debugger/creatortypes.py b/share/qtcreator/debugger/creatortypes.py index 07e124f8774..71970e3498b 100644 --- a/share/qtcreator/debugger/creatortypes.py +++ b/share/qtcreator/debugger/creatortypes.py @@ -90,13 +90,13 @@ def dumpLiteral(d, value): d.putValue(d.hexencode(readLiteral(d, value)), "latin1") -def qdump__Core__Id(d, value): +def qdump__Utils__Id(d, value): val = value.extractPointer() if True: if d.isMsvcTarget(): name = d.nameForCoreId(val).address() else: - name = d.parseAndEvaluate("Core::nameForId(0x%x)" % val).pointer() + name = d.parseAndEvaluate("Utils::nameForId(0x%x)" % val).pointer() d.putSimpleCharArray(name) else: d.putValue(val) |