diff --git a/src/plugins/appstatisticsmonitor/manager.cpp b/src/plugins/appstatisticsmonitor/manager.cpp index a0a08fd36a0..7d0e05582a2 100644 --- a/src/plugins/appstatisticsmonitor/manager.cpp +++ b/src/plugins/appstatisticsmonitor/manager.cpp @@ -3,6 +3,7 @@ #include "manager.h" +#include "appstatisticsmonitortr.h" #include "chart.h" #include "idataprovider.h" @@ -125,8 +126,8 @@ AppStatisticsMonitorView::AppStatisticsMonitorView(AppStatisticsMonitorManager * m_comboBox = new QComboBox(this); form->addRow(m_comboBox); - m_chartMem = std::make_unique(tr("Memory consumption")); - m_chartCpu = std::make_unique(tr("CPU consumption")); + m_chartMem = std::make_unique(Tr::tr("Memory consumption")); + m_chartCpu = std::make_unique(Tr::tr("CPU consumption")); form->addRow(m_chartMem->chartView()); form->addRow(m_chartCpu->chartView()); diff --git a/src/plugins/lua/luaplugin.cpp b/src/plugins/lua/luaplugin.cpp index 8e26519eea4..5e3fd921640 100644 --- a/src/plugins/lua/luaplugin.cpp +++ b/src/plugins/lua/luaplugin.cpp @@ -341,9 +341,9 @@ public: Command *newScriptCommand = ActionBuilder(this, ACTION_NEW_SCRIPT) .setScriptable(true) - .setText(tr("New Script...")) + .setText(Tr::tr("New Script...")) .addToContainer(M_SCRIPT) - .addOnTriggered([](){ + .addOnTriggered([]() { auto command = Core::ActionManager::command(Utils::Id("Wizard.Impl.Q.QCreatorScript")); if (command && command->action()) command->action()->trigger(); diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index db23abc4697..1fdc82e23d0 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -1718,7 +1718,7 @@ Utils::FilePath findEffectFile(const ModelNode &effectNode) QDirIterator::Subdirectories}); if (matches.isEmpty()) { QMessageBox msgBox; - msgBox.setText(QObject::tr("Effect file %1 not found in the project.").arg(effectFile)); + msgBox.setText(::QObject::tr("Effect file %1 not found in the project.").arg(effectFile)); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setIcon(QMessageBox::Warning); diff --git a/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp index 8eba7549bf5..ef428f35464 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp @@ -105,24 +105,24 @@ QString ModelNode::getIdValidityErrorMessage(const QString &id) return {}; // valid if (id.at(0).isUpper()) - return QObject::tr("ID cannot start with an uppercase character (%1).").arg(id); + return ::QObject::tr("ID cannot start with an uppercase character (%1).").arg(id); if (id.at(0).isDigit()) - return QObject::tr("ID cannot start with a number (%1).").arg(id); + return ::QObject::tr("ID cannot start with a number (%1).").arg(id); if (id.contains(' ')) - return QObject::tr("ID cannot include whitespace (%1).").arg(id); + return ::QObject::tr("ID cannot include whitespace (%1).").arg(id); if (ModelUtils::isQmlKeyword(id)) - return QObject::tr("%1 is a reserved QML keyword.").arg(id); + return ::QObject::tr("%1 is a reserved QML keyword.").arg(id); if (ModelUtils::isQmlBuiltinType(id)) - return QObject::tr("%1 is a reserved Qml type.").arg(id); + return ::QObject::tr("%1 is a reserved Qml type.").arg(id); if (ModelUtils::isDiscouragedQmlId(id)) - return QObject::tr("%1 is a reserved property keyword.").arg(id); + return ::QObject::tr("%1 is a reserved property keyword.").arg(id); - return QObject::tr("ID includes invalid characters (%1).").arg(id); + return ::QObject::tr("ID includes invalid characters (%1).").arg(id); } bool ModelNode::hasId() const