debugger: fix argv dumper

Change-Id: I4162aba467aafc235ccc5145cf77e59d6e9e1924
Reviewed-by: hjk <qthjk@ovi.com>

share/qtcreator/dumper/dumper.py

@@ -1475,10 +1475,6 @@ class Dumper:
             self.putBetterType(typeName)
             return
 
-        format = self.formats.get(self.currentIName)
-        if format is None:
-            format = self.typeformats.get(stripClassTag(typeName))
-
         if type.code == ArrayCode:
             targettype = type.target()
             self.putAddress(value.address)
@@ -1533,6 +1529,9 @@ class Dumper:
 
             innerType = type.target()
             innerTypeName = str(innerType.unqualified())
+            format = self.formats.get(self.currentIName)
+            if format is None:
+                format = self.typeformats.get(stripForFormat(str(type)))
 
             if innerType.code == VoidCode:
                 #warn("VOID POINTER: %s" % format)
@@ -1664,6 +1663,10 @@ class Dumper:
         else:
             dtypeName = typeName
 
+        format = self.formats.get(self.currentIName)
+        if format is None:
+            format = self.typeformats.get(stripForFormat(dtypeName))
+
         if self.useFancy and (format is None or format >= 1):
             self.putAddress(value.address)
             self.putType(dtypeName)