From fa304b45e51adf5ed5f7716701d6433c0afc3f69 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 17 Jan 2011 15:09:23 +0100
Subject: [PATCH] debugger: make qt namespace retrieval more robust

---
 share/qtcreator/gdbmacros/dumper.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index bee83af8293..b797231b1fd 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -792,6 +792,7 @@ def makeExpression(value):
 qqNs = None
 
 def qtNamespace():
+    # FIXME: This only works when call from inside a Qt function frame.
     global qqNs
     if not qqNs is None:
         return qqNs
@@ -803,8 +804,10 @@ def qtNamespace():
         # "}"
         pos1 = str.find("struct") + 7
         pos2 = str.find("QString::Null")
-        qqNs = str[pos1:pos2]
-        return qqNs
+        if pos1 > -1 and pos2 > -1:
+            qqNs = str[pos1:pos2]
+            return qqNs
+        return ""
     except:
         return ""