diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index f98f65589d6..0e7fd60b4f9 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -52186,7 +52186,7 @@ What do you want to do?
- WebAssembly::Internal::EmrunRunConfigurationFactory
+ WebAssembly
Effective emrun call:
Команда запуска emrun:
@@ -52195,9 +52195,6 @@ What do you want to do?
Launch with emrun
Запустить через emrun
-
-
- WebAssembly::Internal::WebAssemblyDevice
Web Browser
Браузер
@@ -52206,9 +52203,6 @@ What do you want to do?
WebAssembly Runtime
Среда WebAssembly
-
-
- WebAssembly::Internal::WebAssemblyToolChain
Emscripten Compiler
Компилятор Emscripten
@@ -52217,9 +52211,6 @@ What do you want to do?
WebAssembly
WebAssembly
-
-
- WebAssembly::Internal::WebBrowserSelectionAspect
Web browser
Браузер
@@ -52228,9 +52219,6 @@ What do you want to do?
Web browser:
Браузер:
-
-
- WebAssemblyPlugin
WebAssembly
Qt Version is meant for WebAssembly
diff --git a/src/plugins/webassembly/webassemblydevice.cpp b/src/plugins/webassembly/webassemblydevice.cpp
index ca5e0f2a1ce..86611d6f91e 100644
--- a/src/plugins/webassembly/webassemblydevice.cpp
+++ b/src/plugins/webassembly/webassemblydevice.cpp
@@ -3,6 +3,7 @@
#include "webassemblyconstants.h"
#include "webassemblydevice.h"
+#include "webassemblytr.h"
#include
@@ -16,7 +17,7 @@ WebAssemblyDevice::WebAssemblyDevice()
{
setupId(IDevice::AutoDetected, Constants::WEBASSEMBLY_DEVICE_DEVICE_ID);
setType(Constants::WEBASSEMBLY_DEVICE_TYPE);
- const QString displayNameAndType = tr("Web Browser");
+ const QString displayNameAndType = Tr::tr("Web Browser");
setDefaultDisplayName(displayNameAndType);
setDisplayType(displayNameAndType);
setDeviceState(IDevice::DeviceStateUnknown);
@@ -26,13 +27,13 @@ WebAssemblyDevice::WebAssemblyDevice()
IDevice::Ptr WebAssemblyDevice::create()
{
- return IDevice::Ptr(new WebAssemblyDevice);
+ return IDevicePtr(new WebAssemblyDevice);
}
WebAssemblyDeviceFactory::WebAssemblyDeviceFactory()
: ProjectExplorer::IDeviceFactory(Constants::WEBASSEMBLY_DEVICE_TYPE)
{
- setDisplayName(WebAssemblyDevice::tr("WebAssembly Runtime"));
+ setDisplayName(Tr::tr("WebAssembly Runtime"));
setCombinedIcon(":/webassembly/images/webassemblydevicesmall.png",
":/webassembly/images/webassemblydevice.png");
setConstructionFunction(&WebAssemblyDevice::create);
diff --git a/src/plugins/webassembly/webassemblydevice.h b/src/plugins/webassembly/webassemblydevice.h
index 5f66ed830e0..962c348e310 100644
--- a/src/plugins/webassembly/webassemblydevice.h
+++ b/src/plugins/webassembly/webassemblydevice.h
@@ -10,8 +10,6 @@ namespace Internal {
class WebAssemblyDevice final : public ProjectExplorer::DesktopDevice
{
- Q_DECLARE_TR_FUNCTIONS(WebAssembly::Internal::WebAssemblyDevice)
-
public:
static ProjectExplorer::IDevice::Ptr create();
diff --git a/src/plugins/webassembly/webassemblyoptionspage.cpp b/src/plugins/webassembly/webassemblyoptionspage.cpp
index 85bcdf533e2..038d93ed110 100644
--- a/src/plugins/webassembly/webassemblyoptionspage.cpp
+++ b/src/plugins/webassembly/webassemblyoptionspage.cpp
@@ -6,6 +6,7 @@
#include "webassemblyoptionspage.h"
#include "webassemblyqtversion.h"
#include "webassemblytoolchain.h"
+#include "webassemblytr.h"
#include
#include
@@ -24,8 +25,6 @@ namespace Internal {
class WebAssemblyOptionsWidget : public Core::IOptionsPageWidget
{
- Q_DECLARE_TR_FUNCTIONS(WebAssembly::Internal::WebAssemblyOptionsWidget)
-
public:
WebAssemblyOptionsWidget();
@@ -47,18 +46,16 @@ WebAssemblyOptionsWidget::WebAssemblyOptionsWidget()
auto mainLayout = new QVBoxLayout(this);
{
- auto pathChooserBox = new QGroupBox(tr("Emscripten SDK path:"));
+ auto pathChooserBox = new QGroupBox(Tr::tr("Emscripten SDK path:"));
pathChooserBox->setFlat(true);
auto layout = new QVBoxLayout(pathChooserBox);
auto instruction = new QLabel(
- tr("Select the root directory of an "
- ""
- "installed Emscripten SDK. Ensure that the activated SDK version is "
- "compatible with the "
- "Qt 5 "
- "or "
- "Qt 6 "
- "version that you plan to develop against."));
+ Tr::tr("Select the root directory of an installed %1. "
+ "Ensure that the activated SDK version is compatible with the %2 "
+ "or %3 version that you plan to develop against.")
+ .arg(R"(Emscripten SDK)")
+ .arg(R"(Qt 5)")
+ .arg(R"(Qt 6)"));
instruction->setOpenExternalLinks(true);
instruction->setWordWrap(true);
@@ -78,7 +75,7 @@ WebAssemblyOptionsWidget::WebAssemblyOptionsWidget()
}
{
- m_emSdkEnvGroupBox = new QGroupBox(tr("Emscripten SDK environment:"));
+ m_emSdkEnvGroupBox = new QGroupBox(Tr::tr("Emscripten SDK environment:"));
m_emSdkEnvGroupBox->setFlat(true);
m_emSdkEnvGroupBox->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::MinimumExpanding);
auto layout = new QVBoxLayout(m_emSdkEnvGroupBox);
@@ -95,8 +92,8 @@ WebAssemblyOptionsWidget::WebAssemblyOptionsWidget()
const QString minimumSupportedQtVersion =
WebAssemblyQtVersion::minimumSupportedQtVersion().toString();
m_qtVersionDisplay = new InfoLabel(
- tr("Note: %1 supports Qt %2 for WebAssembly and higher. "
- "Your installed lower version(s) are not supported.")
+ Tr::tr("Note: %1 supports Qt %2 for WebAssembly and higher. "
+ "Your installed lower Qt version(s) are not supported.")
.arg(Core::ICore::versionString(), minimumSupportedQtVersion),
InfoLabel::Warning);
m_qtVersionDisplay->setElideMode(Qt::ElideNone);
@@ -110,9 +107,10 @@ static QString environmentDisplay(const FilePath &sdkRoot)
Environment env;
WebAssemblyEmSdk::addToEnvironment(sdkRoot, env);
QString result;
- result.append(WebAssemblyOptionsWidget::tr("Adding directories to PATH:
"));
+ auto h4 = [](const QString &text) { return QString("" + text + "
"); };
+ result.append(h4(Tr::tr("Adding directories to PATH:")));
result.append(env.value("PATH").replace(OsSpecificAspects::pathListSeparator(sdkRoot.osType()), "
"));
- result.append(WebAssemblyOptionsWidget::tr("Setting environment variables:
"));
+ result.append(h4(Tr::tr("Setting environment variables:")));
for (const QString &envVar : env.toStringList()) {
if (!envVar.startsWith("PATH")) // Path was already printed out above
result.append(envVar + "
");
@@ -135,12 +133,15 @@ void WebAssemblyOptionsWidget::updateStatus()
const QVersionNumber minVersion = WebAssemblyToolChain::minimumSupportedEmSdkVersion();
const bool versionTooLow = sdkVersion < minVersion;
m_emSdkVersionDisplay->setType(versionTooLow ? InfoLabel::NotOk : InfoLabel::Ok);
+ auto bold = [](const QString &text) { return QString("" + text + ""); };
m_emSdkVersionDisplay->setText(
- versionTooLow ? tr("The activated version %1 is not supported by %2."
- "
Activate version %3 or higher.")
- .arg(sdkVersion.toString(), Core::ICore::versionString(),
- minVersion.toString())
- : tr("Activated version: %1").arg(sdkVersion.toString()));
+ versionTooLow ? Tr::tr("The activated version %1 is not supported by %2. "
+ "Activate version %3 or higher.")
+ .arg(bold(sdkVersion.toString()))
+ .arg(bold(Core::ICore::versionString()))
+ .arg(bold(minVersion.toString()))
+ : Tr::tr("Activated version: %1")
+ .arg(bold(sdkVersion.toString())));
m_emSdkEnvDisplay->setText(environmentDisplay(sdkPath));
}
@@ -165,7 +166,7 @@ void WebAssemblyOptionsWidget::apply()
WebAssemblyOptionsPage::WebAssemblyOptionsPage()
{
setId(Id(Constants::SETTINGS_ID));
- setDisplayName(WebAssemblyOptionsWidget::tr("WebAssembly"));
+ setDisplayName(Tr::tr("WebAssembly"));
setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
setWidgetCreator([] { return new WebAssemblyOptionsWidget; });
}
diff --git a/src/plugins/webassembly/webassemblyplugin.cpp b/src/plugins/webassembly/webassemblyplugin.cpp
index b59adcec7a4..7466208cbbd 100644
--- a/src/plugins/webassembly/webassemblyplugin.cpp
+++ b/src/plugins/webassembly/webassemblyplugin.cpp
@@ -1,13 +1,14 @@
// Copyright (C) 2020 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
-#include "webassemblyplugin.h"
#include "webassemblyconstants.h"
#include "webassemblydevice.h"
#include "webassemblyoptionspage.h"
+#include "webassemblyplugin.h"
#include "webassemblyqtversion.h"
#include "webassemblyrunconfiguration.h"
#include "webassemblytoolchain.h"
+#include "webassemblytr.h"
#include
#include
@@ -83,10 +84,10 @@ void WebAssemblyPlugin::askUserAboutEmSdkSetup()
return;
InfoBarEntry info(setupWebAssemblyEmSdk,
- tr("Setup Emscripten SDK for WebAssembly? "
+ Tr::tr("Setup Emscripten SDK for WebAssembly? "
"To do it later, select Edit > Preferences > Devices > WebAssembly."),
InfoBarEntry::GlobalSuppression::Enabled);
- info.addCustomButton(tr("Setup Emscripten SDK"), [setupWebAssemblyEmSdk] {
+ info.addCustomButton(Tr::tr("Setup Emscripten SDK"), [setupWebAssemblyEmSdk] {
ICore::infoBar()->removeInfo(setupWebAssemblyEmSdk);
QTimer::singleShot(0, []() { ICore::showOptionsDialog(Constants::SETTINGS_ID); });
});
diff --git a/src/plugins/webassembly/webassemblyqtversion.cpp b/src/plugins/webassembly/webassemblyqtversion.cpp
index bb76a4a7fdd..28f155dd525 100644
--- a/src/plugins/webassembly/webassemblyqtversion.cpp
+++ b/src/plugins/webassembly/webassemblyqtversion.cpp
@@ -3,6 +3,7 @@
#include "webassemblyconstants.h"
#include "webassemblyqtversion.h"
+#include "webassemblytr.h"
#include
#include
@@ -29,8 +30,7 @@ WebAssemblyQtVersion::WebAssemblyQtVersion() = default;
QString WebAssemblyQtVersion::description() const
{
- return QCoreApplication::translate("WebAssemblyPlugin", "WebAssembly",
- "Qt Version is meant for WebAssembly");
+ return Tr::tr("WebAssembly", "Qt Version is meant for WebAssembly");
}
QSet WebAssemblyQtVersion::targetDeviceTypes() const
@@ -59,7 +59,7 @@ QString WebAssemblyQtVersion::invalidReason() const
if (!baseReason.isEmpty())
return baseReason;
- return tr("%1 does not support Qt for WebAssembly below version %2.")
+ return Tr::tr("%1 does not support Qt for WebAssembly below version %2.")
.arg(Core::ICore::versionString())
.arg(minimumSupportedQtVersion().toString());
}
diff --git a/src/plugins/webassembly/webassemblyqtversion.h b/src/plugins/webassembly/webassemblyqtversion.h
index d7541154cd1..b7fee8a4536 100644
--- a/src/plugins/webassembly/webassemblyqtversion.h
+++ b/src/plugins/webassembly/webassemblyqtversion.h
@@ -11,8 +11,6 @@ namespace Internal {
class WebAssemblyQtVersion : public QtSupport::QtVersion
{
- Q_DECLARE_TR_FUNCTIONS(WebAssembly::Internal::WebAssemblyQtVersion)
-
public:
WebAssemblyQtVersion();
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index 1b76826671c..bdbc58e7ed3 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -1,9 +1,10 @@
// Copyright (C) 2020 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
-#include "webassemblyrunconfigurationaspects.h"
-#include "webassemblyrunconfiguration.h"
#include "webassemblyconstants.h"
+#include "webassemblyrunconfiguration.h"
+#include "webassemblyrunconfigurationaspects.h"
+#include "webassemblytr.h"
#include
#include
@@ -73,7 +74,7 @@ public:
auto webBrowserAspect = addAspect(target);
auto effectiveEmrunCall = addAspect();
- effectiveEmrunCall->setLabelText(EmrunRunConfigurationFactory::tr("Effective emrun call:"));
+ effectiveEmrunCall->setLabelText(Tr::tr("Effective emrun call:"));
effectiveEmrunCall->setDisplayStyle(StringAspect::TextEditDisplay);
effectiveEmrunCall->setReadOnly(true);
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.h b/src/plugins/webassembly/webassemblyrunconfiguration.h
index 8019880c73d..d613cffe9fa 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.h
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.h
@@ -11,8 +11,6 @@ namespace Internal {
class EmrunRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory
{
- Q_DECLARE_TR_FUNCTIONS(WebAssembly::Internal::EmrunRunConfigurationFactory)
-
public:
EmrunRunConfigurationFactory();
};
diff --git a/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp b/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp
index ab5e644b27c..8dbe9b3c183 100644
--- a/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "webassemblyrunconfigurationaspects.h"
+#include "webassemblytr.h"
#include
#include
@@ -41,7 +42,8 @@ static WebBrowserEntries parseEmrunOutput(const QByteArray &output)
static WebBrowserEntries emrunBrowsers(ProjectExplorer::Target *target)
{
- WebBrowserEntries result{{{}, WebBrowserSelectionAspect::tr("Default Browser")}};
+ WebBrowserEntries result;
+ result.append(qMakePair(QString(), Tr::tr("Default Browser")));
if (auto bc = target->activeBuildConfiguration()) {
const Utils::Environment environment = bc->environment();
const Utils::FilePath emrunPath = environment.searchInPath("emrun");
@@ -64,7 +66,7 @@ WebBrowserSelectionAspect::WebBrowserSelectionAspect(ProjectExplorer::Target *ta
const int defaultIndex = qBound(0, m_availableBrowsers.count() - 1, 1);
m_currentBrowser = m_availableBrowsers.at(defaultIndex).first;
}
- setDisplayName(tr("Web Browser"));
+ setDisplayName(Tr::tr("Web Browser"));
setId("WebBrowserAspect");
setSettingsKey("RunConfiguration.WebBrowser");
@@ -82,7 +84,7 @@ void WebBrowserSelectionAspect::addToLayout(LayoutBuilder &builder)
m_currentBrowser = m_webBrowserComboBox->currentData().toString();
emit changed();
});
- builder.addItems({tr("Web browser:"), m_webBrowserComboBox});
+ builder.addItems({Tr::tr("Web browser:"), m_webBrowserComboBox});
}
void WebBrowserSelectionAspect::fromMap(const QVariantMap &map)
diff --git a/src/plugins/webassembly/webassemblytoolchain.cpp b/src/plugins/webassembly/webassemblytoolchain.cpp
index 2e224049504..bbed53e96df 100644
--- a/src/plugins/webassembly/webassemblytoolchain.cpp
+++ b/src/plugins/webassembly/webassemblytoolchain.cpp
@@ -1,9 +1,10 @@
// Copyright (C) 2020 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
-#include "webassemblytoolchain.h"
#include "webassemblyconstants.h"
#include "webassemblyemsdk.h"
+#include "webassemblytoolchain.h"
+#include "webassemblytr.h"
#include
#include
@@ -58,7 +59,7 @@ WebAssemblyToolChain::WebAssemblyToolChain() :
{
setSupportedAbis({toolChainAbi()});
setTargetAbi(toolChainAbi());
- setTypeDisplayName(tr("Emscripten Compiler"));
+ setTypeDisplayName(Tr::tr("Emscripten Compiler"));
}
FilePath WebAssemblyToolChain::makeCommand(const Environment &environment) const
@@ -117,7 +118,7 @@ static Toolchains doAutoDetect(const ToolchainDetector &detector)
const FilePath scriptFile = sdk.withNewPath(script).searchInDirectories(env.path());
toolChain->setCompilerCommand(scriptFile);
- const QString displayName = WebAssemblyToolChain::tr("Emscripten Compiler %1 for %2")
+ const QString displayName = Tr::tr("Emscripten Compiler %1 for %2")
.arg(toolChain->version(), QLatin1String(cLanguage ? "C" : "C++"));
toolChain->setDisplayName(displayName);
result.append(toolChain);
@@ -159,7 +160,7 @@ bool WebAssemblyToolChain::areToolChainsRegistered()
WebAssemblyToolChainFactory::WebAssemblyToolChainFactory()
{
- setDisplayName(WebAssemblyToolChain::tr("Emscripten"));
+ setDisplayName(Tr::tr("Emscripten"));
setSupportedToolChainType(Constants::WEBASSEMBLY_TOOLCHAIN_TYPEID);
setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID,
ProjectExplorer::Constants::CXX_LANGUAGE_ID});
diff --git a/src/plugins/webassembly/webassemblytoolchain.h b/src/plugins/webassembly/webassemblytoolchain.h
index 13d4d11009d..cc97573d93e 100644
--- a/src/plugins/webassembly/webassemblytoolchain.h
+++ b/src/plugins/webassembly/webassemblytoolchain.h
@@ -12,8 +12,6 @@ namespace Internal {
class WebAssemblyToolChain final : public ProjectExplorer::GccToolChain
{
- Q_DECLARE_TR_FUNCTIONS(WebAssembly::Internal::WebAssemblyToolChain)
-
public:
WebAssemblyToolChain();