From 67e2db4bcb11fabd633f52b20034ccc6ad1bd8e0 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 20 Aug 2021 10:43:35 +0200 Subject: [PATCH] Debugger: Use QtcProcess in CoreUnpacker Change-Id: I0eeaaf0c6f5d49f92de35a59c5e777e73a6abc66 Reviewed-by: Artem Sokolovskii Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggerruncontrol.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index e1ebd51f4fb..1c1d3ce5aaf 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -134,15 +134,15 @@ private: m_tempCoreFileName = tmp.fileName(); } - m_coreUnpackProcess.setWorkingDirectory(TemporaryDirectory::masterDirectoryPath()); - connect(&m_coreUnpackProcess, QOverload::of(&QProcess::finished), - this, &CoreUnpacker::reportStarted); + m_coreUnpackProcess.setWorkingDirectory(FilePath::fromString(TemporaryDirectory::masterDirectoryPath())); + connect(&m_coreUnpackProcess, &QtcProcess::finished, this, &CoreUnpacker::reportStarted); const QString msg = DebuggerRunTool::tr("Unpacking core file to %1"); appendMessage(msg.arg(m_tempCoreFileName), LogMessageFormat); if (m_coreFileName.endsWith(".lzo")) { - m_coreUnpackProcess.start("lzop", {"-o", m_tempCoreFileName, "-x", m_coreFileName}); + m_coreUnpackProcess.setCommand({"lzop", {"-o", m_tempCoreFileName, "-x", m_coreFileName}}); + m_coreUnpackProcess.start(); return; } @@ -150,10 +150,11 @@ private: appendMessage(msg.arg(m_tempCoreFileName), LogMessageFormat); m_tempCoreFile.setFileName(m_tempCoreFileName); m_tempCoreFile.open(QFile::WriteOnly); - connect(&m_coreUnpackProcess, &QProcess::readyRead, this, [this] { - m_tempCoreFile.write(m_coreUnpackProcess.readAll()); + connect(&m_coreUnpackProcess, &QtcProcess::readyReadStandardOutput, this, [this] { + m_tempCoreFile.write(m_coreUnpackProcess.readAllStandardOutput()); }); - m_coreUnpackProcess.start("gzip", {"-c", "-d", m_coreFileName}); + m_coreUnpackProcess.setCommand({"gzip", {"-c", "-d", m_coreFileName}}); + m_coreUnpackProcess.start(); return; } @@ -164,7 +165,7 @@ private: QFile m_tempCoreFile; QString m_coreFileName; QString m_tempCoreFileName; - QProcess m_coreUnpackProcess; + QtcProcess m_coreUnpackProcess; }; class DebuggerRunToolPrivate