From 40a6bef7ed96de23cfdb49345b1f9205dfb9273a Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 20 Nov 2019 15:50:09 +0100 Subject: [PATCH] Android: Default to armv7 instead of arm64 (qmake & CMake) Change-Id: I1c67a047784204a8a08c8a1ec4ec672532cbed11 Reviewed-by: BogDan Vatra --- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 6 +++--- src/plugins/qmakeprojectmanager/qmakestep.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index adbf2bc3f8c..b4917b732e3 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -209,10 +209,10 @@ void CMakeBuildConfiguration::initialize() auto androidAbis = bs->data(Android::Constants::AndroidABIs).toStringList(); QString preferredAbi; - if (androidAbis.contains("arm64-v8a")) { - preferredAbi = "arm64-v8a"; - } else if (androidAbis.isEmpty() || androidAbis.contains("armeabi-v7a")) { + if (androidAbis.contains("armeabi-v7a")) { preferredAbi = "armeabi-v7a"; + } else if (androidAbis.isEmpty() || androidAbis.contains("arm64-v8a")) { + preferredAbi = "arm64-v8a"; } else { preferredAbi = androidAbis.first(); } diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index dc184bf1379..de016fc2c47 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -811,8 +811,8 @@ void QMakeStepConfigWidget::updateSummaryLabel() item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); item->setCheckState(Qt::Unchecked); isAndroid = isAndroid && abi.osFlavor() == Abi::OSFlavor::AndroidLinuxFlavor; - if (isAndroid && (item->text() == "arm64-v8a" || - (m_preferredAbiIndex == -1 && item->text() == "armeabi-v7a"))) { + if (isAndroid && (item->text() == "armeabi-v7a" || + (m_preferredAbiIndex == -1 && item->text() == "arm64-v8a"))) { m_preferredAbiIndex = m_ui->abisListWidget->count() - 1; } }