diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-12-17 13:13:07 +0200 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-01-24 09:36:07 +0000 |
commit | 9d221706f48cfcc6aad17f8cd6730ae0c9107716 (patch) | |
tree | 3451264f630a1ec2f21da178d42dd336e887e1b7 | |
parent | f55ec2f930b47717827f3a407c4e62034f95c3e7 (diff) | |
download | qt-creator-9d221706f48cfcc6aad17f8cd6730ae0c9107716.tar.gz |
Android: Install both target and whole project artefacts with qmake
As a workaround for qmake projects with dependencies for shared
libraries, make sure to install both the current target and the whole
project artefacts, the latter was the default before QTCREATORBUG-25793.
Task-number: QTCREATORBUG-26550
Change-Id: I8f313652bb582b2512ebe3471933e53120baf020
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r-- | src/plugins/android/androidpackageinstallationstep.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 5fe710b6b7..e635461e73 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -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. |