diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-10-28 08:31:26 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2018-10-29 11:01:56 +0000 |
| commit | 5b7e0afc10032dc14aa617cacce8469ec9994289 (patch) | |
| tree | f50c15d8d9b4032ca767c2c4da911713b2e4a919 /src/plugins/android | |
| parent | 4f7d24acb6f618ac3b2560e3746bf361848105f5 (diff) | |
| download | qt-creator-5b7e0afc10032dc14aa617cacce8469ec9994289.tar.gz | |
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 <robert.loehning@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/androidbuildapkstep.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index ed137fd1a6..20b8e73876 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -336,7 +336,7 @@ void AndroidBuildApkStep::run(QFutureInterface<bool> &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 c88ebbaa98..d49971115c 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); |