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

Android: Guard against assert due to invalid access

Browse Source 
Change-Id: I4f98f18b786c95acae09a3be3b924953f1292e61
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Alessandro Portale
2024-03-05 13:22:25 +01:00
parent 6b6aa89650
commit 3c94f63e67
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -228,11 +228,12 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
m_step->setBuildToolsVersion(buildToolsSdkComboBox->itemData(idx).value<QVersionNumber>()); m_step->setBuildToolsVersion(buildToolsSdkComboBox->itemData(idx).value<QVersionNumber>());
}); });
if (!buildToolsVersions.isEmpty()) {
const int initIdx = (m_step->buildToolsVersion().majorVersion() < 1) const int initIdx = (m_step->buildToolsVersion().majorVersion() < 1)
? buildToolsVersions.indexOf(buildToolsVersions.last()) ? buildToolsVersions.indexOf(buildToolsVersions.last())
: buildToolsVersions.indexOf(m_step->buildToolsVersion()); : buildToolsVersions.indexOf(m_step->buildToolsVersion());
buildToolsSdkComboBox->setCurrentIndex(initIdx); buildToolsSdkComboBox->setCurrentIndex(initIdx);
}
auto createAndroidTemplatesButton = new QPushButton(Tr::tr("Create Templates")); auto createAndroidTemplatesButton = new QPushButton(Tr::tr("Create Templates"));
createAndroidTemplatesButton->setToolTip( createAndroidTemplatesButton->setToolTip(