From 02a9a462164d42e1cc8abfc74a1688d3a4b1bf52 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 15 Apr 2010 11:57:14 +0200
Subject: [PATCH] Debugger[CDB]: Fix watchers. Task-number: QTCREATORBUG-1139

---
 src/plugins/debugger/cdb/cdbdebugengine.cpp | 6 +++++-
 src/plugins/debugger/watchhandler.cpp       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp
index 605452261b3..55aff4d0b31 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
@@ -617,7 +617,11 @@ void CdbDebugEngine::evaluateWatcher(WatchData *wd)
     QString errorMessage;
     QString value;
     QString type;
-    if (m_d->evaluateExpression(wd->exp, &value, &type, &errorMessage)) {
+    QString exp = wd->exp;
+    // Remove locals watch prefix.
+    if (exp.startsWith(QLatin1String("local.")))
+        exp.remove(0, 6);
+    if (m_d->evaluateExpression(exp, &value, &type, &errorMessage)) {
         wd->setValue(value);
         wd->setType(type);
     } else {
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 1d8cf6896a5..7cfe8694360 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1372,6 +1372,7 @@ void WatchHandler::watchExpression(const QString &exp)
     else
         insertData(data);
     m_manager->updateWatchData(data);
+    m_manager->updateWatchersWindow();
     saveWatchers();
 }