From 4946677df48f74e029df11cacaeba2a2cc53ae69 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 16 Oct 2020 13:23:25 +0300 Subject: [PATCH] Android: fix aab label name and supported versions Task-number: QTCREATORBUG-24681 Change-Id: I5634deaf395d547d2659d71d1612897e1a3d9a2b Reviewed-by: Alessandro Portale --- src/plugins/android/androidbuildapkstep.cpp | 2 +- src/plugins/android/androidqtversion.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index d3331d5994c..4c33d6b5679 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -324,7 +324,7 @@ QWidget *AndroidBuildApkWidget::createAdvancedGroup() auto vbox = new QVBoxLayout(group); QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(m_step->kit()); if (version && version->supportsMultipleQtAbis()) { - auto buildAAB = new QCheckBox(tr("Build .aab (Android App Bundle)"), group); + auto buildAAB = new QCheckBox(tr("Build Android App Bundle (*.aab)"), group); buildAAB->setChecked(m_step->buildAAB()); connect(buildAAB, &QAbstractButton::toggled, m_step, &AndroidBuildApkStep::setBuildAAB); vbox->addWidget(buildAAB); diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 32a58ffc667..2f306671eb3 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -86,7 +86,8 @@ QString AndroidQtVersion::invalidReason() const bool AndroidQtVersion::supportsMultipleQtAbis() const { - return qtVersion() >= QtSupport::QtVersionNumber{5, 14}; + return qtVersion() >= QtSupport::QtVersionNumber{5, 14} + && qtVersion() < QtSupport::QtVersionNumber{6, 0}; } Abis AndroidQtVersion::detectQtAbis() const