summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-11-17 18:24:25 +0100
committerhjk <hjk121@nokiamail.com>2013-11-17 18:28:51 +0100
commit7f6c793f756042b801aba321dcfc946560a4700a (patch)
treea1c149c255d80d1a750cb4c3dca71043afcace51 /src/plugins
parente64cc71194cbe283dfe9bd2cd688f01fcdcadf34 (diff)
downloadqt-creator-7f6c793f756042b801aba321dcfc946560a4700a.tar.gz
Debugger: Fix passing of maximum string length
Change-Id: I96498b93bb1632de8ca960ae24ec54e31f8c0897 Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp4
-rw-r--r--src/plugins/debugger/gdb/pythongdbengine.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 05978ecbc1..ae83e0801f 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1829,10 +1829,6 @@ void GdbEngine::handlePythonSetup(const GdbResponse &response)
postCommand("bbsetup");
}
- postCommand("python qqStringCutOff = "
- + debuggerCore()->action(MaximalStringLength)->value().toByteArray(),
- ConsoleCommand|NonCriticalResponse);
-
m_hasPython = true;
GdbMi data;
data.fromStringMultiple(response.consoleStreamOutput);
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 1c79150c40..3fd1283799 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/src/plugins/debugger/gdb/pythongdbengine.cpp
@@ -37,6 +37,7 @@
#include <debugger/stackhandler.h>
+#include <utils/savedaction.h>
#include <utils/qtcassert.h>
#define PRECONDITION QTC_CHECK(hasPython())
@@ -58,6 +59,9 @@ void GdbEngine::updateLocalsPython(const UpdateParameters &params)
expanded += "typeformats:" + handler->typeFormatRequests() + ' ';
expanded += "formats:" + handler->individualFormatRequests();
+ QByteArray cutOff = " stringcutoff:"
+ + debuggerCore()->action(MaximalStringLength)->value().toByteArray();
+
QByteArray watchers;
const QString fileName = stackHandler()->currentFrame().file;
const QString function = stackHandler()->currentFrame().function;
@@ -127,7 +131,7 @@ void GdbEngine::updateLocalsPython(const UpdateParameters &params)
resultVar = "resultvarname:" + m_resultVarName + ' ';
postCommand("bb options:" + options + " vars:" + params.varList + ' '
- + resultVar + expanded + " watchers:" + watchers.toHex(),
+ + resultVar + expanded + " watchers:" + watchers.toHex() + cutOff,
Discardable, CB(handleStackFramePython), QVariant(params.tryPartial));
}