From b0fb396dc9b81a2dc6cf54230b8d0d347d3362bc Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 4 Jan 2010 13:48:44 +0100
Subject: [PATCH] debugger: don't issue 'name' field twice for watched items

---
 share/qtcreator/gdbmacros/dumper.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index 072ba5b590a..a7ddeafcc9a 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -410,7 +410,7 @@ class FrameCommand(gdb.Command):
             d.beginHash()
             d.put('iname="watch.%s",' % name)
             d.put('name="%s",' % exp)
-            d.put('exp="%s"' % exp)
+            d.put('exp="%s",' % exp)
             try:
                 list = eval(exp)
                 #warn("EVAL: LIST: %s" % list)
@@ -437,7 +437,7 @@ class FrameCommand(gdb.Command):
         d.beginHash()
         d.put('iname="watch.%s",' % name)
         d.put('name="%s",' % exp)
-        d.put('exp="%s"' % exp)
+        d.put('exp="%s",' % exp)
         handled = False
         if exp == "<Edit>":
             d.put(',value=" ",')
@@ -445,7 +445,7 @@ class FrameCommand(gdb.Command):
         else:
             try:
                 value = parseAndEvaluate(exp)
-                item = Item(value, "watch", name, name)
+                item = Item(value, "watch", None, None)
                 d.safePutItemHelper(item)
             except RuntimeError:
                 d.put(',value="<invalid>",')
-- 
GitLab