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

QbsProjectManager: Fix setting qbs.architecture for Android

Browse Source 
- Use values that qbs understands.
- Make sure qbs.architecture(s) is set also with no Qt present.

This was broken in 6b31f9cf23.

Fixes: QTCREATORBUG-23489
Change-Id: If7bf8862b850defa04e8f45eace99e08388d780f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Christian Kandeler
2020-01-17 11:32:19 +01:00
parent 81dfdea37c
commit f1b2120ccb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -295,13 +295,13 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
data.insert("Android.ndk.ndkDir", ndkDir);
}
}
data.remove(QBS_ARCHITECTURES);
data.remove(QBS_ARCHITECTURE);
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k);
if (qtVersion) {
data.remove(QBS_ARCHITECTURES);
data.remove(QBS_ARCHITECTURE);
QStringList abis;
for (const auto &abi : qtVersion->qtAbis())
abis << abi.param();
abis << architecture(abi);
if (abis.size() == 1)
data.insert(QLatin1String(QBS_ARCHITECTURE), abis.first());
else