Debugger: Re-work qt namespace detection with gdb

We can always use python now. Avoids one roundtrip on startup,
a temporary file, and only does it when needed.

Change-Id: Id32a812bec477307da1d93950f7758f3a5699464
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
index 8a3011de4f..2e88280d9f 100644
--- a/share/qtcreator/debugger/gdbbridge.py
+++ b/share/qtcreator/debugger/gdbbridge.py
@@ -353,6 +353,7 @@ class Dumper(DumperBase):
         self.childEventAddress = None
         self.typesReported = {}
         self.typesToReport = {}
+        self.qtNamespaceToReport = None
 
     def run(self, args):
         self.output = []
@@ -494,6 +495,10 @@ class Dumper(DumperBase):
         self.output.append(']')
         self.typesToReport = {}
 
+        if self.qtNamespaceToReport:
+            self.output.append(',qtnamespace="%s"' % self.qtNamespaceToReport)
+            self.qtNamespaceToReport = None
+
         return "".join(self.output)
 
     def enterSubItem(self, item):
@@ -1567,8 +1572,13 @@ class Dumper(DumperBase):
             pos2 = out.find("QString::Null")
             if pos1 > -1 and pos2 > -1:
                 namespace = out[pos1:pos2]
+
+            # Doesn't work
+            #gdb.write('=qt-namespace-detected,ns="%s"' % namespace)
+            self.qtNamespaceToReport = namespace
+
             self.cachedQtNamespace = namespace
-            self.ns = lambda: self.cachedQtNamespace
+            self.qtNamespace = lambda: self.cachedQtNamespace
         except:
             pass