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

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

@@ -192,6 +192,7 @@ public:
QTimer m_timer;
QEventLoop m_eventLoop;
QtcProcess::Result m_result = QtcProcess::StartFailed;
QProcess::ExitStatus m_exitStatus = QProcess::NormalExit;
int m_exitCode = -1;
FilePath m_binary;
ChannelBuffer m_stdOut;
@@ -1079,13 +1080,14 @@ void QtcProcessPrivate::slotTimeout()
}
}
void QtcProcessPrivate::slotFinished(int exitCode, QProcess::ExitStatus e)
void QtcProcessPrivate::slotFinished(int exitCode, QProcess::ExitStatus status)
{
if (debug)
qDebug() << Q_FUNC_INFO << exitCode << e;
qDebug() << Q_FUNC_INFO << exitCode << status;
m_hangTimerCount = 0;
m_exitStatus = status;
switch (e) {
switch (status) {
case QProcess::NormalExit:
m_result = interpretExitCode(exitCode);
m_exitCode = exitCode;
@@ -1098,7 +1100,7 @@ void QtcProcessPrivate::slotFinished(int exitCode, QProcess::ExitStatus e)
break;
}
m_eventLoop.quit();
emit q->finished(m_exitCode, e);
emit q->finished();
}
void QtcProcessPrivate::slotError(QProcess::ProcessError e)