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

Android: fix parsing Andorid Abis for Qt 6

Browse Source 
Amends 4946677df4, to allow
parsing the correct supported Abis from qmake.

Fixes: QTCREATORBUG-24828
Change-Id: I20f8cbf5c0f1bcdf3debb0d9b5c47fa77de163ab
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-10-23 16:26:49 +03:00
parent 061a56143c
commit 9d3c156fd3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidqtversion.cpp
View File

@@ -171,9 +171,8 @@ int AndroidQtVersion::minimumNDK() const
void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
{
if (supportsMultipleQtAbis())
m_androidAbis = evaluator->values("ALL_ANDROID_ABIS");
else
m_androidAbis = evaluator->values("ALL_ANDROID_ABIS");
if (m_androidAbis.isEmpty())
m_androidAbis = QStringList{evaluator->value("ANDROID_TARGET_ARCH")};
const QString androidPlatform = evaluator->value("ANDROID_PLATFORM");
if (!androidPlatform.isEmpty()) {