summaryrefslogtreecommitdiff
path: root/share/qtcreator/debugger/dumper.py
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-08-20 09:05:18 +0200
committerEike Ziller <eike.ziller@qt.io>2018-08-20 09:05:18 +0200
commit9f60cdcdaad08200052e03b118db792e1f02e23d (patch)
tree168854630f67a87182a101bddda7f279eae59710 /share/qtcreator/debugger/dumper.py
parentd498a7fcf9bf4dbedd213f9da675094bdf8a80e5 (diff)
parent7a8e6b052ee01cfcd20fd0752749349421da719f (diff)
downloadqt-creator-9f60cdcdaad08200052e03b118db792e1f02e23d.tar.gz
Merge remote-tracking branch 'origin/4.7'
Change-Id: I15962a85b0cc37c5a00e15ef7eac0445aad6c295
Diffstat (limited to 'share/qtcreator/debugger/dumper.py')
-rw-r--r--share/qtcreator/debugger/dumper.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 7e46132096..45ea4d6d76 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -2928,6 +2928,8 @@ class DumperBase:
return str(simple)
if self.ldisplay is not None:
return self.ldisplay
+ if self.type.code == TypeCodeEnum:
+ return self.displayEnum()
#if self.ldata is not None:
# if sys.version_info[0] == 2 and isinstance(self.ldata, buffer):
# return bytes(self.ldata).encode('hex')