From 6b919043bf0c5dfdb1c3b9a6ddec8fd0fe479c1b Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Mon, 8 Jun 2009 11:45:15 +0200
Subject: [PATCH] Partitial revert of d7af85a09755a2a6852052b8621448ab6114ea0a.
broke at least cdb.
Reviewed-By: hjk <qtc-committer@nokia.com>
---
share/qtcreator/gdbmacros/gdbmacros.cpp | 1 +
src/plugins/debugger/watchutils.cpp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 1bf767002b0..b4bb7168bf5 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -2915,6 +2915,7 @@ void *qDumpObjectData440(
d.iname = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
d.exp = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
d.innertype = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
+ d.iname = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
handleProtocolVersion2and3(d);
}
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 887d0c7fa89..d3b130d19aa 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -1270,6 +1270,8 @@ void QtDumperHelper::evaluationParameters(const WatchData &data,
inBuffer->append('\0');
inBuffer->append(inner.toUtf8());
inBuffer->append('\0');
+ inBuffer->append(data.iname.toUtf8());
+ inBuffer->append('\0');
if (debug)
qDebug() << '\n' << Q_FUNC_INFO << '\n' << data.toString() << "\n-->" << outertype << td.type << extraArgs;
--
GitLab