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

Revert "Android/ProjectExplorer: Include parameters into quotes"

Browse Source 
This is wrong. The executable can contain spaces, so it needs the quotes,
and arguments with spaces are also enclosed with quotes.

This reverts commit 9c5afd8e96.

Change-Id: I9c0d3ae7452170195441d0b47b76b5d16252e2c4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Orgad Shaneh
2018-10-28 08:31:26 +02:00
committed by Robert Loehning
parent 4f7d24acb6
commit 5b7e0afc10
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -336,7 +336,7 @@ void AndroidBuildApkStep::run(QFutureInterface<bool> &fi)
void AndroidBuildApkStep::processStarted() void AndroidBuildApkStep::processStarted()
{ {
emit addOutput(tr("Starting: \"%1 %2\"") emit addOutput(tr("Starting: \"%1\" %2")
.arg(QDir::toNativeSeparators(m_command), .arg(QDir::toNativeSeparators(m_command),
m_argumentsPasswordConcealed), m_argumentsPasswordConcealed),
BuildStep::OutputFormat::NormalMessage); BuildStep::OutputFormat::NormalMessage);

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

@@ -295,7 +295,7 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QFutureInter
m_process->start(); m_process->start();
emit addOutput(tr("Starting: \"%1 %2\"") emit addOutput(tr("Starting: \"%1\" %2")
.arg(QDir::toNativeSeparators(m_command), args), .arg(QDir::toNativeSeparators(m_command), args),
BuildStep::OutputFormat::NormalMessage); BuildStep::OutputFormat::NormalMessage);

2
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -245,7 +245,7 @@ void AbstractProcessStep::cleanUp(QProcess *process)
void AbstractProcessStep::processStarted() void AbstractProcessStep::processStarted()
{ {
emit addOutput(tr("Starting: \"%1 %2\"") emit addOutput(tr("Starting: \"%1\" %2")
.arg(QDir::toNativeSeparators(m_param.effectiveCommand()), .arg(QDir::toNativeSeparators(m_param.effectiveCommand()),
m_param.prettyArguments()), m_param.prettyArguments()),
BuildStep::OutputFormat::NormalMessage); BuildStep::OutputFormat::NormalMessage);