forked from qt-creator/qt-creator
Utils: Drop QProcess specific parameters from QtcProcess::finished()
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:
@@ -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 {
|
||||
|
||||
@@ -64,12 +64,13 @@ public:
|
||||
void processStandardError();
|
||||
|
||||
int lastExitCode() const { return m_lastExitCode; }
|
||||
|
||||
signals:
|
||||
void started();
|
||||
void finished();
|
||||
|
||||
private:
|
||||
void handleProcessFinished(int code, QProcess::ExitStatus status);
|
||||
void handleProcessFinished();
|
||||
void checkForCancelled();
|
||||
|
||||
std::unique_ptr<Utils::QtcProcess> m_process;
|
||||
|
||||
Reference in New Issue
Block a user