From 18bee3a08f9339c0fb33a732a1fe45b2b8a9622c Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 17 Dec 2018 10:57:48 +0100 Subject: [PATCH] Debuger: Fix enum dumper (again) Fixes: QTCREATORBUG-21726 Change-Id: I25f4a84d88a915247456ac8e12877d503ae0d49a Reviewed-by: Christian Stenger --- share/qtcreator/debugger/cdbbridge.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py index 2e7b0a073da..d4aab222bbb 100644 --- a/share/qtcreator/debugger/cdbbridge.py +++ b/share/qtcreator/debugger/cdbbridge.py @@ -189,7 +189,7 @@ class Dumper(DumperBase): self.nativeStructAlignment(nativeType) if code == TypeCodeEnum: tdata.enumDisplay = lambda intval, addr, form : \ - self.nativeTypeEnumDisplay(nativeType, addr, form) + self.nativeTypeEnumDisplay(nativeType, intval, form) tdata.templateArguments = self.listTemplateParameters(nativeType.name()) self.registerType(typeId, tdata) # Fix up fields and template args return self.Type(self, typeId) @@ -215,11 +215,11 @@ class Dumper(DumperBase): align = handleItem(f.type(), align) return align - def nativeTypeEnumDisplay(self, nativeType, addr, form): - value = cdbext.createValue(addr, nativeType) + def nativeTypeEnumDisplay(self, nativeType, intval, form): + value = self.nativeParseAndEvaluate('(%s)%d' % (nativeType.name(), intval)) if value is None: return '' - return enumDisplay(value) + return self.enumValue(value) def enumExpression(self, enumType, enumValue): ns = self.qtNamespace()