From b7153131ff2d447751beb32f0cd93487c9471efa Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 21 Mar 2022 17:25:20 +0100 Subject: [PATCH] QbsSession: Get rid of no-op calls to QtcProcess::terminate() Calling QtcProcess::terminate() is a task for implicit ProcessReaper. Delete the process instead. Change-Id: Iaa0e735a136ec0f5a21724f620eb2c542dedf48f Reviewed-by: Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbssession.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp index 5a8e813d3f1..3d2df477b10 100644 --- a/src/plugins/qbsprojectmanager/qbssession.cpp +++ b/src/plugins/qbsprojectmanager/qbssession.cpp @@ -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; }