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

Utils: Combine QtcProcess internal code paths for "finished"

Browse Source 
Change-Id: I884ab33a614fe00087c83fe6daf41c023711dd7f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-06-03 12:25:33 +02:00
parent 93ca1a87a5
commit 0bb0c5bd88
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ public:
connect(m_process, &QProcess::started, connect(m_process, &QProcess::started,
q, &QtcProcess::started); q, &QtcProcess::started);
connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
q, &QtcProcess::finished); this, &QtcProcessPrivate::slotFinished);
connect(m_process, &QProcess::errorOccurred, connect(m_process, &QProcess::errorOccurred,
q, &QtcProcess::errorOccurred); q, &QtcProcess::errorOccurred);
connect(m_process, &QProcess::stateChanged, connect(m_process, &QProcess::stateChanged,
@@ -888,8 +888,6 @@ SynchronousProcess::SynchronousProcess()
d->m_timer.setInterval(1000); d->m_timer.setInterval(1000);
connect(&d->m_timer, &QTimer::timeout, d, &QtcProcessPrivate::slotTimeout); connect(&d->m_timer, &QTimer::timeout, d, &QtcProcessPrivate::slotTimeout);
connect(d->m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
d, &QtcProcessPrivate::slotFinished);
connect(d->m_process, &QProcess::errorOccurred, d, &QtcProcessPrivate::slotError); connect(d->m_process, &QProcess::errorOccurred, d, &QtcProcessPrivate::slotError);
} }
@@ -953,9 +951,6 @@ void SynchronousProcess::runBlocking()
QtcProcess::start(); QtcProcess::start();
waitForFinished(); waitForFinished();
d->m_result = QtcProcess::FinishedWithSuccess;
d->m_exitCode = exitCode();
return; return;
}; };
@@ -1016,13 +1011,6 @@ void SynchronousProcess::runBlocking()
if (state() != QProcess::NotRunning) if (state() != QProcess::NotRunning)
return; return;
d->m_exitCode = exitCode();
if (d->m_result == QtcProcess::StartFailed) {
if (exitStatus() != QProcess::NormalExit)
d->m_result = QtcProcess::TerminatedAbnormally;
else
d->m_result = d->interpretExitCode(d->m_exitCode);
}
d->m_stdOut.append(d->m_process->readAllStandardOutput()); d->m_stdOut.append(d->m_process->readAllStandardOutput());
d->m_stdErr.append(d->m_process->readAllStandardError()); d->m_stdErr.append(d->m_process->readAllStandardError());
} }
@@ -1079,6 +1067,7 @@ void QtcProcessPrivate::slotFinished(int exitCode, QProcess::ExitStatus e)
break; break;
} }
m_eventLoop.quit(); m_eventLoop.quit();
emit q->finished(m_exitCode, e);
} }
void QtcProcessPrivate::slotError(QProcess::ProcessError e) void QtcProcessPrivate::slotError(QProcess::ProcessError e)