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

Merge remote-tracking branch 'origin/6.0' into 7.0

Browse Source 
Change-Id: I72684fe4b0857e52a15ee83721f9d7975582a8d2
This commit is contained in:
Eike Ziller
2022-01-26 09:25:05 +01:00
parent 9def720ef6 250738d858
commit be5fb98f1f
18 changed files with 200 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -107,8 +107,12 @@ bool AndroidPackageInstallationStep::init()
const QString innerQuoted = ProcessArgs::quoteArg(dirPath);
const QString outerQuoted = ProcessArgs::quoteArg("INSTALL_ROOT=" + innerQuoted);
CommandLine cmd{tc->makeCommand(buildEnvironment())};
cmd.addArgs(outerQuoted + " install", CommandLine::Raw);
const FilePath makeCommand = tc->makeCommand(buildEnvironment());
CommandLine cmd{makeCommand};
// Run install on both the target and the whole project as a workaround for QTCREATORBUG-26550.
cmd.addArgs(QString("%1 install && cd %2 && %3 %1 install")
.arg(outerQuoted).arg(ProcessArgs::quoteArg(buildDirectory().toUserOutput()))
.arg(ProcessArgs::quoteArg(makeCommand.toUserOutput())), CommandLine::Raw);
processParameters()->setCommandLine(cmd);
// This is useful when running an example target from a Qt module project.