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

QmakeAndroid: Introduce two new functions in QmakeAndroidQtSupport

Browse Source 
... and use them to remove direct dependency of the QmakeAndroidBuildApkStep
on qmake, so it can be merged into the base AndroidApkStep, leaving
less build system dependent code in the QmakeAndroid plugin.

Change-Id: Id7c6a9cb0e51d6b38850a0ad0e0e83a602f53338
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2018-05-09 09:55:37 +02:00
parent 8e7c1bf1ab
commit ded34daa2b
8 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -148,7 +148,8 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
JavaParser *parser = new JavaParser;
parser->setProjectFileList(Utils::transform(target()->project()->files(ProjectExplorer::Project::AllFiles),
&Utils::FileName::toString));
parser->setSourceDirectory(androidPackageSourceDir());
parser->setSourceDirectory(AndroidManager::androidQtSupport(target())->packageSourceDir(target()));
parser->setBuildDirectory(Utils::FileName::fromString(bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString()));
setOutputParser(parser);