diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 67292e2e26d..1a646ab4e50 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -2931,8 +2931,8 @@ class DumperBase:
                     % (self.name, self.type.name, self.lbitsize, self.lbitpos,
                        self.dumper.hexencode(self.ldata), addr)
 
-        def displayEnum(self, form='%d'):
-            intval = self.integer()
+        def displayEnum(self, form='%d', bitsize=None):
+            intval = self.integer(bitsize)
             dd = self.type.typeData().enumDisplay
             if dd is None:
                 return str(intval)
@@ -2957,7 +2957,7 @@ class DumperBase:
                 return self.detypedef().pointer()
             return self.extractInteger(self.dumper.ptrSize() * 8, True)
 
-        def integer(self):
+        def integer(self, bitsize=None):
             if self.type.code == TypeCodeTypedef:
                 return self.detypedef().integer()
             elif self.type.code == TypeCodeBitfield:
@@ -2966,7 +2966,8 @@ class DumperBase:
             unsigned = self.type.name == 'unsigned' \
                     or self.type.name.startswith('unsigned ') \
                     or self.type.name.find(' unsigned ') != -1
-            bitsize = self.type.bitsize()
+            if bitsize is None:
+                bitsize = self.type.bitsize()
             return self.extractInteger(bitsize, unsigned)
 
         def floatingPoint(self):
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 2aa107429ef..2901c104010 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -492,15 +492,15 @@ def qdump__QEvent(d, value):
         with Children(d):
             # Add a sub-item with the event type.
             with SubItem(d, '[type]'):
-                (vtable, privateD, t) = value.split("pp{ushort}")
-                event_type_name = "QEvent::Type"
+                (vtable, privateD, t, flags) = value.split("pp{short}{short}")
+                event_type_name = d.qtNamespace() + "QEvent::Type"
                 type_value = t.cast(event_type_name)
-                d.putValue(type_value.displayEnum('0x%04x'))
+                d.putValue(type_value.displayEnum('0x%04x', bitsize=16))
                 d.putType(event_type_name)
                 d.putNumChild(0)
 
             # Show the rest of the class fields as usual.
-            d.putFields(value, dumpBase=True)
+            d.putFields(value)
 
 def qdump__QKeyEvent(d, value):
     # QEvent fields
@@ -531,9 +531,9 @@ def qdump__QKeyEvent(d, value):
     #data = d.encodeString(txt)
     key_txt_utf8 = d.encodeStringUtf8(txt)
 
-    k_type_name = "Qt::Key"
-    k_casted_to_enum_value = k.cast(k_type_name)
-    k_name = k_casted_to_enum_value.displayEnum()
+    k_type_name = d.qtNamespace() + "Qt::Key"
+    k_cast_to_enum_value = k.cast(k_type_name)
+    k_name = k_cast_to_enum_value.displayEnum(bitsize=32)
     matches = re.search(r'Key_(\w+)', k_name)
     if matches:
         k_name = matches.group(1)
@@ -587,8 +587,8 @@ def qdump__QKeyEvent(d, value):
         with Children(d):
             # Add a sub-item with the enum name and value.
             with SubItem(d, '[{}]'.format(k_type_name)):
-                k_casted_to_enum_value = k.cast(k_type_name)
-                d.putValue(k_casted_to_enum_value.displayEnum('0x%04x'))
+                k_cast_to_enum_value = k.cast(k_type_name)
+                d.putValue(k_cast_to_enum_value.displayEnum('0x%04x', bitsize=32))
                 d.putType(k_type_name)
                 d.putNumChild(0)
 
@@ -756,7 +756,7 @@ def qdump__QFlags(d, value):
     i = value.split('{int}')[0]
     enumType = value.type[0]
     v = i.cast(enumType.name)
-    d.putValue(v.displayEnum('0x%04x'))
+    d.putValue(v.displayEnum('0x%04x', bitsize=32))
     d.putNumChild(0)