feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Use QtcProcess in CoreUnpacker

Browse Source 
Change-Id: I0eeaaf0c6f5d49f92de35a59c5e777e73a6abc66
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-20 10:43:35 +02:00
parent aec0b31904
commit 67e2db4bcb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -134,15 +134,15 @@ private:
m_tempCoreFileName = tmp.fileName(); m_tempCoreFileName = tmp.fileName();
} }
m_coreUnpackProcess.setWorkingDirectory(TemporaryDirectory::masterDirectoryPath()); m_coreUnpackProcess.setWorkingDirectory(FilePath::fromString(TemporaryDirectory::masterDirectoryPath()));
connect(&m_coreUnpackProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(&m_coreUnpackProcess, &QtcProcess::finished, this, &CoreUnpacker::reportStarted);
this, &CoreUnpacker::reportStarted);
const QString msg = DebuggerRunTool::tr("Unpacking core file to %1"); const QString msg = DebuggerRunTool::tr("Unpacking core file to %1");
appendMessage(msg.arg(m_tempCoreFileName), LogMessageFormat); appendMessage(msg.arg(m_tempCoreFileName), LogMessageFormat);
if (m_coreFileName.endsWith(".lzo")) { 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; return;
} }
@@ -150,10 +150,11 @@ private:
appendMessage(msg.arg(m_tempCoreFileName), LogMessageFormat); appendMessage(msg.arg(m_tempCoreFileName), LogMessageFormat);
m_tempCoreFile.setFileName(m_tempCoreFileName); m_tempCoreFile.setFileName(m_tempCoreFileName);
m_tempCoreFile.open(QFile::WriteOnly); m_tempCoreFile.open(QFile::WriteOnly);
connect(&m_coreUnpackProcess, &QProcess::readyRead, this, [this] { connect(&m_coreUnpackProcess, &QtcProcess::readyReadStandardOutput, this, [this] {
m_tempCoreFile.write(m_coreUnpackProcess.readAll()); 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; return;
} }
@@ -164,7 +165,7 @@ private:
QFile m_tempCoreFile; QFile m_tempCoreFile;
QString m_coreFileName; QString m_coreFileName;
QString m_tempCoreFileName; QString m_tempCoreFileName;
QProcess m_coreUnpackProcess; QtcProcess m_coreUnpackProcess;
}; };
class DebuggerRunToolPrivate class DebuggerRunToolPrivate