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

Fix lupdate issues

Browse Source 
Change-Id: Ifea13b2eca4f4b0cdc548202beac748ada1df578
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Eike Ziller
2024-10-24 09:45:55 +02:00
parent 504a43b36c
commit 7d29505828
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/appstatisticsmonitor/manager.cpp
View File

@@ -3,6 +3,7 @@
#include "manager.h" #include "manager.h"
#include "appstatisticsmonitortr.h"
#include "chart.h" #include "chart.h"
#include "idataprovider.h" #include "idataprovider.h"
@@ -125,8 +126,8 @@ AppStatisticsMonitorView::AppStatisticsMonitorView(AppStatisticsMonitorManager *
m_comboBox = new QComboBox(this); m_comboBox = new QComboBox(this);
form->addRow(m_comboBox); form->addRow(m_comboBox);
m_chartMem = std::make_unique<AppStatisticsMonitorChart>(tr("Memory consumption")); m_chartMem = std::make_unique<AppStatisticsMonitorChart>(Tr::tr("Memory consumption"));
m_chartCpu = std::make_unique<AppStatisticsMonitorChart>(tr("CPU consumption")); m_chartCpu = std::make_unique<AppStatisticsMonitorChart>(Tr::tr("CPU consumption"));
form->addRow(m_chartMem->chartView()); form->addRow(m_chartMem->chartView());
form->addRow(m_chartCpu->chartView()); form->addRow(m_chartCpu->chartView());

2
src/plugins/lua/luaplugin.cpp
View File

@@ -341,7 +341,7 @@ public:
Command *newScriptCommand = ActionBuilder(this, ACTION_NEW_SCRIPT) Command *newScriptCommand = ActionBuilder(this, ACTION_NEW_SCRIPT)
.setScriptable(true) .setScriptable(true)
.setText(tr("New Script...")) .setText(Tr::tr("New Script..."))
.addToContainer(M_SCRIPT) .addToContainer(M_SCRIPT)
.addOnTriggered([]() { .addOnTriggered([]() {
auto command = Core::ActionManager::command(Utils::Id("Wizard.Impl.Q.QCreatorScript")); auto command = Core::ActionManager::command(Utils::Id("Wizard.Impl.Q.QCreatorScript"));

2
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -1718,7 +1718,7 @@ Utils::FilePath findEffectFile(const ModelNode &effectNode)
QDirIterator::Subdirectories}); QDirIterator::Subdirectories});
if (matches.isEmpty()) { if (matches.isEmpty()) {
QMessageBox msgBox; 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.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Warning); msgBox.setIcon(QMessageBox::Warning);

14
src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp
View File

@@ -105,24 +105,24 @@ QString ModelNode::getIdValidityErrorMessage(const QString &id)
return {}; // valid return {}; // valid
if (id.at(0).isUpper()) 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()) 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(' ')) 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)) 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)) 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)) 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 bool ModelNode::hasId() const