Merge remote-tracking branch 'origin/4.9'

Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181

2 files changed, 14 insertions, 5 deletions

diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py
index 9b1dd07810..1e59452ffd 100644
--- a/share/qtcreator/debugger/cdbbridge.py
+++ b/share/qtcreator/debugger/cdbbridge.py
@@ -458,10 +458,6 @@ class Dumper(DumperBase):
     def report(self, stuff):
         sys.stdout.write(stuff + "\n")
 
-    def loadDumpers(self, args):
-        msg = self.setupDumpers()
-        self.reportResult(msg, args)
-
     def findValueByExpression(self, exp):
         return cdbext.parseAndEvaluate(exp)
 
diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py
index 154e0ad67e..8810e09912 100644
--- a/share/qtcreator/debugger/stdtypes.py
+++ b/share/qtcreator/debugger/stdtypes.py
@@ -1024,7 +1024,20 @@ def qdump__std__basic_string(d, value):
 
 def qdump__std____cxx11__basic_string(d, value):
     innerType = value.type[0]
-    (data, size) = value.split("pI")
+    try:
+        allocator = value.type[2].name
+    except:
+        allocator = ''
+    if allocator == 'std::allocator<%s>' % innerType.name:
+        (data, size) = value.split("pI")
+    else:
+        try:
+            data = value["_M_dataplus"]["_M_p"]
+            size = int(value["_M_string_length"])
+        except:
+            d.putEmptyValue()
+            d.putPlainChildren(value)
+            return
     d.check(0 <= size) #and size <= alloc and alloc <= 100*1000*1000)
     d.putCharArrayHelper(data, size, innerType, d.currentItemFormat())