diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 9de1ed38e13f180f1dc015af5e1ebd9e16da444d..55aaff207df1912281b3bc4a63daa00842402421 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -181,11 +181,12 @@ class Children:
                 self.childNumChild = childNumChild
         try:
             if not addrBase is None and not addrStep is None:
-                self.d.put('addrbase="0x%x",' % long(addrBase))
-                self.d.put('addrstep="0x%x",' % long(addrStep))
+                self.d.put('addrbase="0x%x",' % toInteger(addrBase))
+                self.d.put('addrstep="0x%x",' % toInteger(addrStep))
                 self.printsAddress = False
         except:
             warn("ADDRBASE: %s" % addrBase)
+            warn("ADDRSTEP: %s" % addrStep)
         #warn("CHILDREN: %s %s %s" % (numChild, childType, childNumChild))
 
     def __enter__(self):
diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py
index 4d6ac1bd1a988fae6f7da7d48ecdfc47a705a023..d0fac283c0bd55ccc784ba287a493ccc4a7e0aed 100644
--- a/share/qtcreator/debugger/stdtypes.py
+++ b/share/qtcreator/debugger/stdtypes.py
@@ -38,7 +38,7 @@ def qdump____c_style_array__(d, value):
     format = d.currentItemFormat()
     isDefault = format == None and str(targetType.unqualified()) == "char"
     if isDefault or format == 0 or format == 1 or format == 2:
-        blob = d.readMemory(value.address, type.sizeof)
+        blob = d.readMemory(d.addressOf(value), type.sizeof)
 
     if isDefault:
         # Use Latin1 as default for char [].
@@ -56,7 +56,7 @@ def qdump____c_style_array__(d, value):
         d.putValue("@0x%x" % d.pointerValue(value.cast(targetType.pointer())))
 
     if d.currentIName in d.expandedINames:
-        p = value.address
+        p = d.addressOf(value)
         ts = targetType.sizeof
         if not d.tryPutArrayContents(targetType, p, int(type.sizeof / ts)):
             with Children(d, childType=targetType,