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

Android: Default to armv7 instead of arm64 (qmake & CMake)

Browse Source 
Change-Id: I1c67a047784204a8a08c8a1ec4ec672532cbed11
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
BogDan Vatra
2019-11-20 15:50:09 +01:00
committed by Alessandro Portale
parent 2808f633ec
commit 40a6bef7ed
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -209,10 +209,10 @@ void CMakeBuildConfiguration::initialize()
auto androidAbis = bs->data(Android::Constants::AndroidABIs).toStringList(); auto androidAbis = bs->data(Android::Constants::AndroidABIs).toStringList();
QString preferredAbi; QString preferredAbi;
if (androidAbis.contains("arm64-v8a")) { if (androidAbis.contains("armeabi-v7a")) {
preferredAbi = "arm64-v8a";
} else if (androidAbis.isEmpty() || androidAbis.contains("armeabi-v7a")) {
preferredAbi = "armeabi-v7a"; preferredAbi = "armeabi-v7a";
} else if (androidAbis.isEmpty() || androidAbis.contains("arm64-v8a")) {
preferredAbi = "arm64-v8a";
} else { } else {
preferredAbi = androidAbis.first(); preferredAbi = androidAbis.first();
} }

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

@@ -811,8 +811,8 @@ void QMakeStepConfigWidget::updateSummaryLabel()
item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
item->setCheckState(Qt::Unchecked); item->setCheckState(Qt::Unchecked);
isAndroid = isAndroid && abi.osFlavor() == Abi::OSFlavor::AndroidLinuxFlavor; isAndroid = isAndroid && abi.osFlavor() == Abi::OSFlavor::AndroidLinuxFlavor;
if (isAndroid && (item->text() == "arm64-v8a" || if (isAndroid && (item->text() == "armeabi-v7a" ||
(m_preferredAbiIndex == -1 && item->text() == "armeabi-v7a"))) { (m_preferredAbiIndex == -1 && item->text() == "arm64-v8a"))) {
m_preferredAbiIndex = m_ui->abisListWidget->count() - 1; m_preferredAbiIndex = m_ui->abisListWidget->count() - 1;
} }
} }