diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-16 13:23:25 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-16 11:43:37 +0000 |
| commit | 4946677df48f74e029df11cacaeba2a2cc53ae69 (patch) | |
| tree | 76a1cd97868c9a42262fc4dccb3477774cc3054e /src | |
| parent | dd62254e4e5c1d56861a915da8c1484539860b1f (diff) | |
Android: fix aab label name and supported versions
Task-number: QTCREATORBUG-24681
Change-Id: I5634deaf395d547d2659d71d1612897e1a3d9a2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/androidbuildapkstep.cpp | 2 | ||||
| -rw-r--r-- | 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 d3331d5994..4c33d6b567 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 32a58ffc66..2f306671eb 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 |