Merge remote-tracking branch 'origin/4.9'

Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181

4 files changed, 18 insertions, 8 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())
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
index c13781558c..dd4a0adbd1 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -267,13 +267,13 @@ static bool isList(const QQmlProperty &property)
 
 static bool isQJSValue(const QQmlProperty &property)
 {
-    return !strcmp(property.propertyTypeName(), "QJSValue");
+    return property.isValid() && !strcmp(property.propertyTypeName(), "QJSValue");
 }
 
 static bool isObject(const QQmlProperty &property)
 {
     /* QVariant and QJSValue can also store QObjects. Lets trust our model. */
-    return (property.propertyTypeCategory() == QQmlProperty::Object
+    return property.isValid() && (property.propertyTypeCategory() == QQmlProperty::Object
             || !strcmp(property.propertyTypeName(), "QVariant")
             || isQJSValue(property));
 }
diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro
index 0df9762fcc..0df2d53ad4 100644
--- a/share/qtcreator/translations/translations.pro
+++ b/share/qtcreator/translations/translations.pro
@@ -73,7 +73,8 @@ plugin_sources -= src/plugins/plugins.pro \
 shared_sources = $$files($$IDE_SOURCE_TREE/src/shared/*)
 shared_sources ~= s,^$$re_escape($$IDE_SOURCE_TREE/),,g$$i_flag
 shared_sources -= \
-    src/shared/qbs
+    src/shared/qbs \
+    src/shared/shared.pro
 sources = src/app src/libs $$plugin_sources $$shared_sources share/qtcreator/qmldesigner
 
 for(path, INCLUDEPATH): include_options *= -I$$shell_quote($$path)