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

ProjectExplorer: Simplify use of AbstractProcessStep::init()

Browse Source 
1. Systematically check for AbstractProcessStep::init() first in
   derived classes.
2. Use setupProcessParameters(processParameters()); by default in
   the base implementation.
3. Drop all re-implementations that are effectively the same.

Change-Id: I0ae54dd4909b354672a63ee56d0b7c2ea0732494
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-14 17:17:55 +02:00
parent 9f378d41e4
commit 0d185a0ad3
23 changed files with 47 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,9 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bs
bool AndroidPackageInstallationStep::init()
{
if (!AbstractProcessStep::init())
return false;
ToolChain *tc = ToolChainKitAspect::cxxToolChain(kit());
QTC_ASSERT(tc, return false);
@@ -101,16 +104,14 @@ bool AndroidPackageInstallationStep::init()
CommandLine cmd{tc->makeCommand(buildEnvironment())};
cmd.addArgs(outerQuoted + " install", CommandLine::Raw);
ProcessParameters *pp = processParameters();
setupProcessParameters(pp);
pp->setCommandLine(cmd);
processParameters()->setCommandLine(cmd);
m_androidDirsToClean.clear();
// don't remove gradle's cache, it takes ages to rebuild it.
m_androidDirsToClean << dirPath + "/assets";
m_androidDirsToClean << dirPath + "/libs";
return AbstractProcessStep::init();
return true;
}
QString AndroidPackageInstallationStep::nativeAndroidBuildPath() const