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

Android: allow passing apps arguments via manifest on non-debug mode

Browse Source 
Uses 00a1e5da7e1aea373a7e6be1d51e1573ff167dd8.

Task-number: QTCREATORBUG-23712
Change-Id: I9a7e134420b608815589578f3851abf150674fd3
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-08-24 09:24:22 +03:00
parent 29bc4801e3
commit e9c9440653
7 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -436,6 +436,8 @@ bool QmakeProFileNode::setData(Utils::Id role, const QVariant &value) const
return pro->setProVariable("ANDROID_PACKAGE_SOURCE_DIR", {value.toString()}, scope, flags);
if (role == Android::Constants::ANDROID_ABIS)
return pro->setProVariable("ANDROID_ABIS", {value.toStringList()}, scope, flags);
if (role == Android::Constants::ANDROID_APPLICATION_ARGUMENTS)
return pro->setProVariable("ANDROID_APPLICATION_ARGUMENTS", {value.toString()}, scope, flags);
return false;
}

1
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -1589,6 +1589,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input)
result->newVarValues[Variable::AndroidDeploySettingsFile] = exactReader->values(QLatin1String("ANDROID_DEPLOYMENT_SETTINGS_FILE"));
result->newVarValues[Variable::AndroidPackageSourceDir] = exactReader->values(QLatin1String("ANDROID_PACKAGE_SOURCE_DIR"));
result->newVarValues[Variable::AndroidAbis] = exactReader->values(QLatin1String("ANDROID_ABIS"));
result->newVarValues[Variable::AndroidApplicationArguments] = exactReader->values(QLatin1String("ANDROID_APPLICATION_ARGUMENTS"));
result->newVarValues[Variable::AndroidExtraLibs] = exactReader->values(QLatin1String("ANDROID_EXTRA_LIBS"));
result->newVarValues[Variable::AppmanPackageDir] = exactReader->values(QLatin1String("AM_PACKAGE_DIR"));
result->newVarValues[Variable::AppmanManifest] = exactReader->values(QLatin1String("AM_MANIFEST"));

1
src/plugins/qmakeprojectmanager/qmakeparsernodes.h
View File

@@ -101,6 +101,7 @@ enum class Variable {
AndroidAbis,
AndroidPackageSourceDir,
AndroidExtraLibs,
AndroidApplicationArguments,
AppmanPackageDir,
AppmanManifest,
IsoIcons,