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

Android: avoid adding ANDROID_ABIS to the project file

Browse Source 
Use buildSystem::property()/setProperty() to keep track of the
selected ABI and avoid polluting the *.pro file with it.

Task-number: QTCREATORBUG-24674
Change-Id: I5516a77c9f2d1a8975045e1d7c383e72c52db9d7
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-11-05 01:55:58 +02:00
parent 291991f1d2
commit 33b06f5b81
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,8 +434,6 @@ bool QmakeProFileNode::setData(Utils::Id role, const QVariant &value) const
return pro->setProVariable("ANDROID_EXTRA_LIBS", value.toStringList(), scope, flags);
if (role == Android::Constants::AndroidPackageSourceDir)
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);

3
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -662,8 +662,7 @@ void QMakeStep::abisChanged()
args << prefix + '"' + m_selectedAbis.join(' ') + '"';
setExtraArguments(args);
const QString buildKey = target()->activeBuildKey();
buildSystem()->setExtraData(buildKey, Android::Constants::ANDROID_ABIS, m_selectedAbis);
buildSystem()->setProperty(Android::Constants::ANDROID_ABIS, m_selectedAbis);
}
updateAbiWidgets();