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

Utils: Simplify QtcProcess::exitMessage() interface

Browse Source 
This was requiring parameters the process object already knows.

This is a slight behavior change in most cases, it now includes
always the command line arguments, which previously only happened
in gcctoolchain.cpp and iarewtoolchain.cpp.

Change-Id: Id25a68c397e2f1d8bf52ab29210e215b1de46c6d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-14 13:12:46 +02:00
parent 3113b0e6d6
commit b2dc771d80
18 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/qtcprocess.cpp
View File

@@ -608,20 +608,22 @@ void SynchronousProcessResponse::clear()
rawStdErr.clear();
}
QString QtcProcess::exitMessage(const QString &binary, int timeoutS) const
QString QtcProcess::exitMessage()
{
const QString fullCmd = commandLine().toUserOutput();
switch (result()) {
case Finished:
return QtcProcess::tr("The command \"%1\" finished successfully.").arg(QDir::toNativeSeparators(binary));
return QtcProcess::tr("The command \"%1\" finished successfully.").arg(fullCmd);
case FinishedError:
return QtcProcess::tr("The command \"%1\" terminated with exit code %2.").arg(QDir::toNativeSeparators(binary)).arg(exitCode());
return QtcProcess::tr("The command \"%1\" terminated with exit code %2.")
.arg(fullCmd).arg(exitCode());
case TerminatedAbnormally:
return QtcProcess::tr("The command \"%1\" terminated abnormally.").arg(QDir::toNativeSeparators(binary));
return QtcProcess::tr("The command \"%1\" terminated abnormally.").arg(fullCmd);
case StartFailed:
return QtcProcess::tr("The command \"%1\" could not be started.").arg(QDir::toNativeSeparators(binary));
return QtcProcess::tr("The command \"%1\" could not be started.").arg(fullCmd);
case Hang:
return QtcProcess::tr("The command \"%1\" did not respond within the timeout limit (%2 s).")
.arg(QDir::toNativeSeparators(binary)).arg(timeoutS);
.arg(fullCmd).arg(d->m_hangTimerCount);
}
return QString();
}