From e054c9e3295b9fd56ea815d9ec250d08823ae930 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 6 Dec 2024 17:21:54 +0100 Subject: [PATCH] Debugger: Use internal decoding of Process for gdbserver Change-Id: I174df8ef1c1a93aa25a8863030855552faea7bda Reviewed-by: Marcus Tillmanns --- src/plugins/debugger/debuggerruncontrol.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index a585deb5fc7..18a4e1030cb 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -54,7 +54,6 @@ #include #include -#include #include using namespace Core; @@ -105,9 +104,6 @@ public: // DebugServer Process debuggerServerProc; - QTextCodec *debuggerServerCodec = QTextCodec::codecForName("utf8"); - QTextCodec::ConverterState outputCodecState; // FIXME: Handle on Process side. - QTextCodec::ConverterState errorCodecState; ProcessHandle serverAttachPid; bool serverUseMulti = true; bool serverEssential = true; @@ -875,6 +871,8 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm if (EngineManager::engines().isEmpty()) toolRunCount = 0; + d->debuggerServerProc.setUtf8Codec(); + d->runId = QString::number(++toolRunCount); d->allowTerminal = allowTerminal; @@ -1155,17 +1153,13 @@ void DebuggerRunTool::startDebugServerIfNeededAndContinueStartup() connect(&d->debuggerServerProc, &Process::readyReadStandardOutput, this, [this] { - const QByteArray data = d->debuggerServerProc.readAllRawStandardOutput(); - const QString msg = d->debuggerServerCodec->toUnicode( - data.constData(), data.length(), &d->outputCodecState); + const QString msg = d->debuggerServerProc.readAllStandardOutput(); runControl()->postMessage(msg, StdOutFormat, false); }); connect(&d->debuggerServerProc, &Process::readyReadStandardError, this, [this] { - const QByteArray data = d->debuggerServerProc.readAllRawStandardError(); - const QString msg = d->debuggerServerCodec->toUnicode( - data.constData(), data.length(), &d->errorCodecState); + const QString msg = d->debuggerServerProc.readAllStandardError(); runControl()->postMessage(msg, StdErrFormat, false); });