diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-01-17 11:32:19 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-01-17 11:44:01 +0000 |
| commit | f1b2120ccb43e22586072b257c0fa9b2c247f4d4 (patch) | |
| tree | 9651fe4dfbfa23954910fc332b8b7a555b9119d5 | |
| parent | 81dfdea37c162c774e38c6f2746ca2bc59169eeb (diff) | |
| download | qt-creator-f1b2120ccb43e22586072b257c0fa9b2c247f4d4.tar.gz | |
QbsProjectManager: Fix setting qbs.architecture for Android
- 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>
| -rw-r--r-- | src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index cfb7b63991..75a80aee7a 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -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 |