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

QbsSession: Get rid of no-op calls to QtcProcess::terminate()

Browse Source 
Calling QtcProcess::terminate() is a task for implicit ProcessReaper.
Delete the process instead.

Change-Id: Iaa0e735a136ec0f5a21724f620eb2c542dedf48f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2022-03-21 17:25:20 +01:00
parent e3bb18f8e1
commit b7153131ff
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbssession.cpp
View File

@@ -244,11 +244,9 @@ QbsSession::~QbsSession()
if (d->qbsProcess) {
d->qbsProcess->disconnect(this);
quit();
if (d->qbsProcess->state() == QProcess::Running && !d->qbsProcess->waitForFinished(10000))
d->qbsProcess->terminate();
if (d->qbsProcess->state() == QProcess::Running && !d->qbsProcess->waitForFinished(10000))
d->qbsProcess->kill();
d->qbsProcess->waitForFinished(1000);
if (d->qbsProcess->state() == QProcess::Running)
d->qbsProcess->waitForFinished(10000);
delete d->qbsProcess;
}
delete d;
}