feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-10-29 15:13:06 +01:00
parent 5011ba940f 0ae5695649
commit 67b0637934
21 changed files with 109 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1170,12 +1170,7 @@ public slots:
exp = fixCppExpression(exp);
if (exp.isEmpty())
return;
const QString name = exp;
// Prefer to watch an existing local variable by its expression (address) if it can be found.
WatchHandler *watchHandler = currentEngine()->watchHandler();
if (const WatchData *localVariable = watchHandler->findCppLocalVariable(exp))
exp = QLatin1String(localVariable->exp);
watchHandler->watchExpression(exp, name);
currentEngine()->watchHandler()->watchVariable(exp);
}
void handleExecExit()