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

Android, Debugger: Simplify setUseCtrlCStub callers

Browse Source 
The Windows-only restriction is nowadays handled inside QtcProcess.

Change-Id: I77d6914831ff172026665a429b497940c60970ac
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-06-03 11:12:51 +02:00
parent f4ed1d20ec
commit fde88f9f07
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -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,

3
src/plugins/android/androidsdkmanager.cpp
View File

@@ -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;

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -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();