From 5b7e0afc10032dc14aa617cacce8469ec9994289 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 28 Oct 2018 08:31:26 +0200 Subject: [PATCH] Revert "Android/ProjectExplorer: Include parameters into quotes" 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 9c5afd8e96306b36b02e6f225ea79abcf497f279. Change-Id: I9c0d3ae7452170195441d0b47b76b5d16252e2c4 Reviewed-by: Robert Loehning Reviewed-by: Leena Miettinen --- src/plugins/android/androidbuildapkstep.cpp | 2 +- src/plugins/android/androiddeployqtstep.cpp | 2 +- src/plugins/projectexplorer/abstractprocessstep.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index ed137fd1a63..20b8e73876a 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -336,7 +336,7 @@ void AndroidBuildApkStep::run(QFutureInterface &fi) void AndroidBuildApkStep::processStarted() { - emit addOutput(tr("Starting: \"%1 %2\"") + emit addOutput(tr("Starting: \"%1\" %2") .arg(QDir::toNativeSeparators(m_command), m_argumentsPasswordConcealed), BuildStep::OutputFormat::NormalMessage); diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index c88ebbaa985..d49971115ca 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -295,7 +295,7 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QFutureInter m_process->start(); - emit addOutput(tr("Starting: \"%1 %2\"") + emit addOutput(tr("Starting: \"%1\" %2") .arg(QDir::toNativeSeparators(m_command), args), BuildStep::OutputFormat::NormalMessage); diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index d613136021d..1e7f33bf658 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -245,7 +245,7 @@ void AbstractProcessStep::cleanUp(QProcess *process) void AbstractProcessStep::processStarted() { - emit addOutput(tr("Starting: \"%1 %2\"") + emit addOutput(tr("Starting: \"%1\" %2") .arg(QDir::toNativeSeparators(m_param.effectiveCommand()), m_param.prettyArguments()), BuildStep::OutputFormat::NormalMessage);