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

Prefer ARM/X86_64 for Android, prefer 64bit

Browse Source 
Change-Id: I8729f6975fc9d99f3ef00a087d4f4eebd0f7e8e5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
BogDan Vatra
2022-10-26 16:46:15 +03:00
committed by BogDan Vatra
parent c84d12227d
commit 661bec83d4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -703,15 +703,19 @@ void QMakeStep::updateAbiWidgets()
if (selectedAbis.isEmpty()) { if (selectedAbis.isEmpty()) {
if (qtVersion->hasAbi(Abi::LinuxOS, Abi::AndroidLinuxFlavor)) { if (qtVersion->hasAbi(Abi::LinuxOS, Abi::AndroidLinuxFlavor)) {
// Prefer ARM for Android, prefer 32bit. // Prefer ARM/X86_64 for Android, prefer 64bit.
for (const Abi &abi : abis) { for (const Abi &abi : abis) {
if (abi.param() == ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A) if (abi.param() == ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A) {
selectedAbis.append(abi.param()); selectedAbis.append(abi.param());
break;
}
} }
if (selectedAbis.isEmpty()) { if (selectedAbis.isEmpty()) {
for (const Abi &abi : abis) { for (const Abi &abi : abis) {
if (abi.param() == ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A) if (abi.param() == ProjectExplorer::Constants::ANDROID_ABI_X86_64) {
selectedAbis.append(abi.param()); selectedAbis.append(abi.param());
break;
}
} }
} }
} else if (qtVersion->hasAbi(Abi::DarwinOS) && !isIos(target()->kit()) && HostOsInfo::isRunningUnderRosetta()) { } else if (qtVersion->hasAbi(Abi::DarwinOS) && !isIos(target()->kit()) && HostOsInfo::isRunningUnderRosetta()) {