From 089b50f7d3570266a88c3902e58d4f371b12224d Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 2 Oct 2018 11:29:57 +0200 Subject: [PATCH] Debugger: Fix display of upper half of short unsigned ints Change-Id: Ie15c66c02c15420436b26c65af3cee9a19634e5c Fixes: QTCREATORBUG-21038 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/dumper.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index a2d97989eff..11c6b314f0e 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -2948,7 +2948,10 @@ class DumperBase: return self.detypedef().integer() elif self.type.code == TypeCodeBitfield: return self.lvalue - unsigned = self.type.name.startswith('unsigned') + # Could be something like 'short unsigned int' + unsigned = self.type.name == 'unsigned' \ + or self.type.name.startswith('unsigned ') \ + or self.type.name.find(' unsigned ') != -1 bitsize = self.type.bitsize() return self.extractInteger(bitsize, unsigned)