From 0e54b6caa17c88da3d00e888ce1e27fbab1e8e85 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 18 Aug 2010 13:44:05 +0200
Subject: [PATCH] debugger: fix assigning new values to structure members
---
src/plugins/debugger/watchhandler.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index cadb0c13129..145ef4dbdfc 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -644,8 +644,18 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
break;
}
- case LocalsExpressionRole:
- return data.exp;
+ case LocalsExpressionRole: {
+ if (!data.exp.isEmpty())
+ return data.exp;
+ quint64 addr = data.coreAddress();
+ if (addr && !data.type.isEmpty())
+ return QString("*(%1*)%2").arg(data.type).arg(addr);
+ WatchItem *parent = item->parent;
+ if (parent && !parent->exp.isEmpty())
+ return QString("(%1).%2")
+ .arg(QString::fromLatin1(parent->exp)).arg(data.name);
+ return QVariant();
+ }
case LocalsINameRole:
return data.iname;
--
GitLab