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

Android: Use BuildSystem to access some build related data

Browse Source 
... that's currently stored in ProjectNodes. Plan is still to adapt
all user code like this, and finally move the data storage from
ProjectNode to BuildSystem.

Change-Id: Ida9b47c4a3013b857d00e7792eaf78d9f91b3c9a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-04-03 11:20:42 +02:00
parent cddaecfe21
commit 2033b438ca
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,16 +384,13 @@ void AndroidBuildApkStep::doRun()
} }
const QString buildKey = target()->activeBuildKey(); const QString buildKey = target()->activeBuildKey();
const ProjectNode *node = target()->project()->findNodeForBuildKey(buildKey); BuildSystem *bs = buildSystem();
if (!node)
return false;
bool inputExists = QFile::exists(m_inputFile); bool inputExists = QFile::exists(m_inputFile);
if (inputExists && !AndroidManager::isQtCreatorGenerated(FilePath::fromString(m_inputFile))) if (inputExists && !AndroidManager::isQtCreatorGenerated(FilePath::fromString(m_inputFile)))
return true; // use the generated file if it was not generated by qtcreator return true; // use the generated file if it was not generated by qtcreator
auto targets = node->data(Android::Constants::AndroidTargets).toStringList(); auto targets = bs->extraData(buildKey, Android::Constants::AndroidTargets).toStringList();
if (targets.isEmpty()) if (targets.isEmpty())
return inputExists; // qmake does this job for us return inputExists; // qmake does this job for us
@@ -440,19 +437,19 @@ void AndroidBuildApkStep::doRun()
} }
deploySettings["application-binary"] = applicationBinary; deploySettings["application-binary"] = applicationBinary;
QString extraLibs = node->data(Android::Constants::AndroidExtraLibs).toString(); QString extraLibs = bs->extraData(buildKey, Android::Constants::AndroidExtraLibs).toString();
if (!extraLibs.isEmpty()) if (!extraLibs.isEmpty())
deploySettings["android-extra-libs"] = extraLibs; deploySettings["android-extra-libs"] = extraLibs;
QString androidSrcs = node->data(Android::Constants::AndroidPackageSourceDir).toString(); QString androidSrcs = bs->extraData(buildKey, Android::Constants::AndroidPackageSourceDir).toString();
if (!androidSrcs.isEmpty()) if (!androidSrcs.isEmpty())
deploySettings["android-package-source-directory"] = androidSrcs; deploySettings["android-package-source-directory"] = androidSrcs;
QString qmlImportPath = node->data("QML_IMPORT_PATH").toString(); QString qmlImportPath = bs->extraData(buildKey, "QML_IMPORT_PATH").toString();
if (!qmlImportPath.isEmpty()) if (!qmlImportPath.isEmpty())
deploySettings["qml-import-paths"] = qmlImportPath; deploySettings["qml-import-paths"] = qmlImportPath;
QString qmlRootPath = node->data("QML_ROOT_PATH").toString(); QString qmlRootPath = bs->extraData(buildKey, "QML_ROOT_PATH").toString();
if (qmlRootPath.isEmpty()) if (qmlRootPath.isEmpty())
qmlRootPath = target()->project()->rootProjectDirectory().toString(); qmlRootPath = target()->project()->rootProjectDirectory().toString();
deploySettings["qml-root-path"] = qmlRootPath; deploySettings["qml-root-path"] = qmlRootPath;