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

Android: Remove command line and version numbers from translations

Browse Source 
Change-Id: Ib4fcd6cbf0a023e074aaad4b265c0ab60edac01a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Alessandro Portale
2024-02-27 11:07:28 +01:00
parent 226806e0fb
commit c536712707
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,16 +209,20 @@ static expected_str<void> testJavaC(const FilePath &jdkPath)
if (!jdkPath.isReadableDir()) if (!jdkPath.isReadableDir())
return make_unexpected(Tr::tr("The selected path does not exist or is not readable.")); return make_unexpected(Tr::tr("The selected path does not exist or is not readable."));
const FilePath bin = jdkPath.pathAppended("bin/javac" QTC_HOST_EXE_SUFFIX); const QString javacCommand("javac");
const QString versionParameter("-version");
constexpr int requiredMajorVersion = 17;
const FilePath bin = jdkPath / "bin" / (javacCommand + QTC_HOST_EXE_SUFFIX);
if (!bin.isExecutableFile()) if (!bin.isExecutableFile())
return make_unexpected( return make_unexpected(
Tr::tr("The selected path does not contain an executable bin/javac.")); Tr::tr("Could not find \"%1\" in the selected path.")
.arg(bin.toUserOutput()));
QVersionNumber jdkVersion; QVersionNumber jdkVersion;
Process javacProcess; Process javacProcess;
CommandLine cmd(bin, {"-version"}); const CommandLine cmd(bin, {versionParameter});
javacProcess.setProcessChannelMode(QProcess::ProcessChannelMode::MergedChannels); javacProcess.setProcessChannelMode(QProcess::ProcessChannelMode::MergedChannels);
javacProcess.setCommand(cmd); javacProcess.setCommand(cmd);
javacProcess.runBlocking(); javacProcess.runBlocking();
@@ -227,17 +231,22 @@ static expected_str<void> testJavaC(const FilePath &jdkPath)
if (javacProcess.exitCode() != 0) if (javacProcess.exitCode() != 0)
return make_unexpected( return make_unexpected(
Tr::tr("The selected path does not contain a valid JDK. (javac -version failed: %1)") Tr::tr("The selected path does not contain a valid JDK. (%1 failed: %2)")
.arg(cmd.toUserOutput())
.arg(stdOut)); .arg(stdOut));
// We expect "javac <version>" where <version> is "major.minor.patch" // We expect "javac <version>" where <version> is "major.minor.patch"
if (!stdOut.startsWith("javac ")) const QString outputPrefix = javacCommand + " ";
return make_unexpected(Tr::tr("Unexpected output from \"javac -version\": %1").arg(stdOut)); if (!stdOut.startsWith(outputPrefix))
return make_unexpected(Tr::tr("Unexpected output from \"%1\": %2")
.arg(cmd.toUserOutput())
.arg(stdOut));
jdkVersion = QVersionNumber::fromString(stdOut.mid(6).split('\n').first()); jdkVersion = QVersionNumber::fromString(stdOut.mid(outputPrefix.length()).split('\n').first());
if (jdkVersion.isNull() || jdkVersion.majorVersion() != 17) { if (jdkVersion.isNull() || jdkVersion.majorVersion() != requiredMajorVersion) {
return make_unexpected(Tr::tr("Unsupported JDK version (needs to be 17): %1 (parsed: %2)") return make_unexpected(Tr::tr("Unsupported JDK version (needs to be %1): %2 (parsed: %3)")
.arg(requiredMajorVersion)
.arg(stdOut) .arg(stdOut)
.arg(jdkVersion.toString())); .arg(jdkVersion.toString()));
} }