aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/debugger/watchhandler.cpp
diff options
context:
space:
mode:
authorKai Koehne <[email protected]>2010-08-23 16:00:24 +0200
committerKai Koehne <[email protected]>2010-08-23 16:00:24 +0200
commitef1e52dfd1008549a80e0e326ea339dac195ec8a (patch)
tree7097926dac3ce8b9dccccdcc6a9e018a67e89e67 /src/plugins/debugger/watchhandler.cpp
parent537404d9814e6b20319402dd5289a702656763b8 (diff)
parentb7af9e06f85e0fa27ed422e00e1a9b03a2348ced (diff)
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
Conflicts: doc/qtcreator.qdoc doc/qtcreator.qdocconf share/qtcreator/gdbmacros/dumper.py share/qtcreator/gdbmacros/gdbmacros.py src/plugins/debugger/debuggermanager.cpp src/plugins/debugger/gdb/attachgdbadapter.cpp src/plugins/debugger/gdb/gdbengine.cpp src/plugins/debugger/watchhandler.cpp src/plugins/mercurial/mercurialjobrunner.h src/plugins/qmljseditor/qmljseditor.cpp src/plugins/qmljseditor/qmljseditor.pro src/plugins/qmljseditor/qmljseditorplugin.cpp src/plugins/qmljseditor/qmljseditorplugin.h src/plugins/qmljseditor/qmljspreviewrunner.cpp src/plugins/qmljseditor/qmljspreviewrunner.h src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp src/plugins/qt4projectmanager/qt4projectmanager.pro src/plugins/qt4projectmanager/qtversionmanager.h src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp src/plugins/qt4projectmanager/wizards/targetsetuppage.h
Diffstat (limited to 'src/plugins/debugger/watchhandler.cpp')
-rw-r--r--src/plugins/debugger/watchhandler.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 145ef4dbdfc..7b952585dcc 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -647,9 +647,12 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
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);
+ if (!data.addr.isEmpty() && !data.type.isEmpty()) {
+ bool ok;
+ const quint64 addr = data.addr.toULongLong(&ok, 16);
+ if (ok && addr)
+ return QString("*(%1*)%2").arg(data.type).arg(addr);
+ }
WatchItem *parent = item->parent;
if (parent && !parent->exp.isEmpty())
return QString("(%1).%2")