diff options
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 6 | ||||
-rw-r--r-- | 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 adbf2bc3f8..b4917b732e 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 dc184bf137..de016fc2c4 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; } } |