From fde88f9f070e386d3cdc170a5ff4acc60c524792 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 3 Jun 2021 11:12:51 +0200 Subject: [PATCH] Android, Debugger: Simplify setUseCtrlCStub callers The Windows-only restriction is nowadays handled inside QtcProcess. Change-Id: I77d6914831ff172026665a429b497940c60970ac Reviewed-by: David Schulz --- src/plugins/android/androiddeployqtstep.cpp | 6 ++---- src/plugins/android/androidsdkmanager.cpp | 3 +-- src/plugins/debugger/gdb/gdbengine.cpp | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index b8107cffc57..d923f4fef51 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -287,13 +287,11 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy() cmd.addArgs({"install", "-r", m_apkPath.toString()}); } - m_process = new Utils::QtcProcess; + m_process = new QtcProcess; m_process->setCommand(cmd); m_process->setWorkingDirectory(m_workingDirectory); m_process->setEnvironment(m_environment); - - if (Utils::HostOsInfo::isWindowsHost()) - m_process->setUseCtrlCStub(true); + m_process->setUseCtrlCStub(true); DeployErrorCode deployError = NoError; connect(m_process, &Utils::QtcProcess::readyReadStandardOutput, diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index abb2a7b4e16..8a6417f080c 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -1043,8 +1043,7 @@ void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdFutureInterface &fi) licenseCommand.setEnvironment(AndroidConfigurations::toolsEnvironment(m_config)); bool reviewingLicenses = false; licenseCommand.setCommand(CommandLine(m_config.sdkManagerToolPath(), {"--licenses", sdkRootArg(m_config)})); - if (Utils::HostOsInfo::isWindowsHost()) - licenseCommand.setUseCtrlCStub(true); + licenseCommand.setUseCtrlCStub(true); licenseCommand.start(); QTextCodec *codec = QTextCodec::codecForLocale(); int inputCounter = 0, steps = -1; diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 1435de0ff29..ed55a53e902 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3802,7 +3802,7 @@ void GdbEngine::setupEngine() CHECK_STATE(EngineSetupRequested); showMessage("TRYING TO START ADAPTER"); - if (isRemoteEngine() && HostOsInfo::isWindowsHost()) + if (isRemoteEngine()) m_gdbProc.setUseCtrlCStub(runParameters().useCtrlCStub); // This is only set for QNX const DebuggerRunParameters &rp = runParameters();