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

Utils: Drop QProcess specific parameters from QtcProcess::finished()

Browse Source 
Mid-term plan is to concentrate on use of QtcProcess::result()
instead which is a bit more system-agnostic.

There's quite a bit of potential for downstream cleanup by
re-using QtcProcess::exitMessage() now.

Change-Id: I3806b3f5933d96e64b7cfb18cc6c52823fddcbcd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-28 14:48:25 +02:00
parent 9426ce99a1
commit fe7d6f0def
31 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -183,7 +183,7 @@ void CMakeProcess::processStandardError()
});
}
void CMakeProcess::handleProcessFinished(int code, QProcess::ExitStatus status)
void CMakeProcess::handleProcessFinished()
{
QTC_ASSERT(m_process && m_future, return);
@@ -192,8 +192,9 @@ void CMakeProcess::handleProcessFinished(int code, QProcess::ExitStatus status)
processStandardOutput();
processStandardError();
const int code = m_process->exitCode();
QString msg;
if (status != QProcess::NormalExit) {
if (m_process->exitStatus() != QProcess::NormalExit) {
if (m_processWasCanceled) {
msg = tr("CMake process was canceled by the user.");
} else {