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

Merge remote-tracking branch 'origin/13.0' into qds/dev

Browse Source 
Change-Id: I524162811ad42e406d7b8e5f38e7043e776005e1
This commit is contained in:
Tim Jenssen
2024-05-07 14:59:51 +02:00
parent fa07abf6d8 7eb09ff0b7
commit ca43b1c0fa
42 changed files with 563 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,7 +254,7 @@ static expected_str<void> testJavaC(const FilePath &jdkPath)
jdkVersion = QVersionNumber::fromString(stdOut.mid(outputPrefix.length()).split('\n').first());
if (jdkVersion.isNull() || jdkVersion.majorVersion() != requiredJavaMajorVersion) {
if (jdkVersion.isNull() /* || jdkVersion.majorVersion() != requiredJavaMajorVersion */ ) {
return make_unexpected(Tr::tr("Unsupported JDK version (needs to be %1): %2 (parsed: %3)")
.arg(requiredJavaMajorVersion)
.arg(stdOut)
@@ -813,6 +813,7 @@ void AndroidSettingsWidget::updateUI()
}
}
m_makeDefaultNdkButton->setEnabled(m_ndkListWidget->count() > 0);
m_makeDefaultNdkButton->setText(isDefaultNdkSelected() ? Tr::tr("Unset Default")
: Tr::tr("Make Default"));
}