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

ClangToolRunner: Connect to QtcProcess::done() signal

Browse Source 
Instead of connecting to errorOccurred() and finished() signals.

Change-Id: Ie15a25000a647d4046b59e9ebeb44c32bc29b53b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-04-14 09:14:31 +02:00
parent b1392e7938
commit 3649176402
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/clangtools/clangtoolrunner.cpp
View File

@@ -85,8 +85,7 @@ void ClangToolRunner::init(const FilePath &outputDirPath, const Environment &env
m_process->setEnvironment(environment); m_process->setEnvironment(environment);
m_process->setWorkingDirectory(m_outputDirPath); // Current clang-cl puts log file into working dir. m_process->setWorkingDirectory(m_outputDirPath); // Current clang-cl puts log file into working dir.
connect(m_process, &QtcProcess::finished, this, &ClangToolRunner::onProcessFinished); connect(m_process, &QtcProcess::done, this, &ClangToolRunner::onProcessDone);
connect(m_process, &QtcProcess::errorOccurred, this, &ClangToolRunner::onProcessError);
} }
QStringList ClangToolRunner::mainToolArguments() const QStringList ClangToolRunner::mainToolArguments() const
@@ -145,9 +144,11 @@ bool ClangToolRunner::run(const QString &fileToAnalyze, const QStringList &compi
return true; return true;
} }
void ClangToolRunner::onProcessFinished() void ClangToolRunner::onProcessDone()
{ {
if (m_process->result() == ProcessResult::FinishedWithSuccess) { if (m_process->result() == ProcessResult::StartFailed) {
emit finishedWithFailure(generalProcessError(m_name), commandlineAndOutput());
} else if (m_process->result() == ProcessResult::FinishedWithSuccess) {
qCDebug(LOG).noquote() << "Output:\n" << m_process->stdOut(); qCDebug(LOG).noquote() << "Output:\n" << m_process->stdOut();
emit finishedWithSuccess(m_fileToAnalyze); emit finishedWithSuccess(m_fileToAnalyze);
} else if (m_process->result() == ProcessResult::FinishedWithError) { } else if (m_process->result() == ProcessResult::FinishedWithError) {
@@ -158,14 +159,6 @@ void ClangToolRunner::onProcessFinished()
} }
} }
void ClangToolRunner::onProcessError(QProcess::ProcessError error)
{
if (error == QProcess::Crashed)
return; // handled by slot of finished()
emit finishedWithFailure(generalProcessError(m_name), commandlineAndOutput());
}
QString ClangToolRunner::commandlineAndOutput() const QString ClangToolRunner::commandlineAndOutput() const
{ {
return tr("Command line: %1\n" return tr("Command line: %1\n"

3
src/plugins/clangtools/clangtoolrunner.h
View File

@@ -77,8 +77,7 @@ protected:
private: private:
void onProcessOutput(); void onProcessOutput();
void onProcessFinished(); void onProcessDone();
void onProcessError(QProcess::ProcessError error);
QString commandlineAndOutput() const; QString commandlineAndOutput() const;