aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-08-10 21:22:02 +0200
committerKai Koehne <kai.koehne@digia.com>2013-08-16 10:00:01 +0200
commitf6ffd2b1ae0b0e38302499c608d9a03b9ce5dc82 (patch)
treed3581f1cfedaf346a4a5f7adbc214a3a0b23c978
parent0bf0cc41ad31bf10215dd386835f5ce89b1de7ae (diff)
Debugger: Disable # characters in watched expression
They are not useful and break the dumper protocol. Change-Id: Ice7e21575e371ee3f8bb8cfb80b73aed47542932 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--src/plugins/debugger/watchhandler.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 0616add575..45e109aad9 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1562,14 +1562,18 @@ QByteArray WatchHandler::watcherName(const QByteArray &exp)
return "watch." + QByteArray::number(theWatcherNames[exp]);
}
-void WatchHandler::watchExpression(const QString &exp, const QString &name)
+void WatchHandler::watchExpression(const QString &exp0, const QString &name)
{
+ QString exp = exp0;
+
QTC_ASSERT(m_engine, return);
// Do not insert the same entry more then once.
if (theWatcherNames.value(exp.toLatin1()))
return;
// FIXME: 'exp' can contain illegal characters
+ exp.replace(QLatin1Char('#'), QString());
+
WatchData data;
data.exp = exp.toLatin1();
data.name = name.isEmpty() ? exp : name;