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

Android: Convert to using Tr::tr

Browse Source 
Change-Id: Ie9110093101b0f49808b4da7b13ac3f47c3bb994
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2022-10-06 17:53:35 +02:00
parent 8741ce6afc
commit 5c65115271
50 changed files with 753 additions and 4360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidconfigurations.cpp
View File

@@ -4,10 +4,11 @@
#include "androidconfigurations.h"
#include "androidconstants.h"
#include "androidtoolchain.h"
#include "androiddevice.h"
#include "androidmanager.h"
#include "androidqtversion.h"
#include "androidtoolchain.h"
#include "androidtr.h"
#include "avddialog.h"
#include <coreplugin/icore.h>
@@ -658,8 +659,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
adbProc.runBlocking();
if (adbProc.result() != ProcessResult::FinishedWithSuccess) {
if (error)
*error = QApplication::translate("AndroidConfiguration", "Could not run: %1")
.arg(cmd.toUserOutput());
*error = Tr::tr("Could not run: %1").arg(cmd.toUserOutput());
return devices;
}
QStringList adbDevs = adbProc.allOutput().split('\n', Qt::SkipEmptyParts);
@@ -700,9 +700,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
Utils::sort(devices);
if (devices.isEmpty() && error)
*error = QApplication::translate("AndroidConfiguration",
"No devices found in output of: %1")
.arg(cmd.toUserOutput());
*error = Tr::tr("No devices found in output of: %1").arg(cmd.toUserOutput());
return devices;
}
@@ -1276,7 +1274,7 @@ static QVariant findOrRegisterDebugger(ToolChain *tc,
if (existingGdb)
return existingGdb->id();
const QString mainName = AndroidConfigurations::tr("Android Debugger (%1, NDK %2)");
const QString mainName = Tr::tr("Android Debugger (%1, NDK %2)");
const QString custom = customDebugger ? QString{"Custom "} : QString{};
// debugger not found, register a new one
// check lldb
@@ -1424,7 +1422,7 @@ void AndroidConfigurations::updateAutomaticKitList()
QString versionStr = QLatin1String("Qt %{Qt:Version}");
if (!qt->isAutodetected())
versionStr = QString("%1").arg(qt->displayName());
k->setUnexpandedDisplayName(tr("Android %1 Clang %2")
k->setUnexpandedDisplayName(Tr::tr("Android %1 Clang %2")
.arg(versionStr)
.arg(getMultiOrSingleAbiString(abis)));
k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(qt).toString());