diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 8084d6ad7ab..d6d5e68786e 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -2327,7 +2327,7 @@ void SynchronousProcess::setStdErrCallback(const std::functionm_stdErr.outputCallback = callback; } -bool SynchronousProcess::terminate() +bool SynchronousProcess::stopProcess() { return d->m_process.stopProcess(); } diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 7e1cc19396d..c090a42e342 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -271,8 +271,7 @@ public: void setStdOutCallback(const std::function &callback); void setStdErrCallback(const std::function &callback); -public slots: - bool terminate(); + bool stopProcess(); private: void slotTimeout(); diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp index 88c8252893b..9d7e5c2b398 100644 --- a/src/libs/utils/shellcommand.cpp +++ b/src/libs/utils/shellcommand.cpp @@ -393,7 +393,7 @@ SynchronousProcessResponse ShellCommand::runSynchronous(const CommandLine &cmd, { SynchronousProcess process; process.setExitCodeInterpreter(interpreter); - connect(this, &ShellCommand::terminate, &process, &SynchronousProcess::terminate); + connect(this, &ShellCommand::terminate, &process, &SynchronousProcess::stopProcess); process.setEnvironment(processEnvironment()); process.setTimeoutS(timeoutS); if (d->m_codec) diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index e436a3705e5..64da75bdb0a 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -178,7 +178,7 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar proc.setStdOutCallback([offset, progressQuota, &proc, &assertionFound, &fi](const QString &out) { int progressPercent = parseProgress(out, assertionFound); if (assertionFound) - proc.terminate(); + proc.stopProcess(); if (progressPercent != -1) fi.setProgressValue(offset + qRound((progressPercent / 100.0) * progressQuota)); }); @@ -187,7 +187,7 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar }); if (interruptible) { QObject::connect(&sdkManager, &AndroidSdkManager::cancelActiveOperations, - &proc, &SynchronousProcess::terminate); + &proc, &SynchronousProcess::stopProcess); } SynchronousProcessResponse response = proc.run({config.sdkManagerToolPath(), newArgs}); if (assertionFound) {