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

Tr: Fix lupdate issues

Browse Source 
Add missing `Tr::` and use some fully qualified namespaces where lupdate
fails to resolve it correctly.

Change-Id: Ied4ac7bf0438a9080d0b76a9a1f5033dbc94a163
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Eike Ziller
2023-10-16 15:14:01 +02:00
parent 15d31610ee
commit a253a2aa95
13 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeparser.cpp
View File

@@ -3,6 +3,8 @@
#include "cmakeparser.h"
#include "cmakeprojectmanagertr.h"
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
@@ -210,7 +212,7 @@ void CMakeParser::flush()
LinkSpecs specs;
m_lastTask.details << QString();
m_lastTask.details << tr("Call stack:");
m_lastTask.details << Tr::tr("Call stack:");
m_lines += 2;
m_callStack->push_front(m_errorOrWarningLine);

18
src/plugins/cmakeprojectmanager/presetsparser.cpp
View File

@@ -444,7 +444,8 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
{
const Utils::expected_str<QByteArray> jsonContents = jsonFile.fileContents();
if (!jsonContents) {
errorMessage = Tr::tr("Failed to read file \"%1\".").arg(jsonFile.fileName());
errorMessage
= ::CMakeProjectManager::Tr::tr("Failed to read file \"%1\".").arg(jsonFile.fileName());
return false;
}
@@ -460,7 +461,8 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
}
if (!jsonDoc.isObject()) {
errorMessage = Tr::tr("Invalid file \"%1\".").arg(jsonFile.fileName());
errorMessage
= ::CMakeProjectManager::Tr::tr("Invalid file \"%1\".").arg(jsonFile.fileName());
return false;
}
@@ -469,7 +471,8 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
m_presetsData.fileDir = jsonFile.parentDir();
if (!parseVersion(root.value("version"), m_presetsData.version)) {
errorMessage = Tr::tr("Invalid \"version\" in file \"%1\".").arg(jsonFile.fileName());
errorMessage = ::CMakeProjectManager::Tr::tr("Invalid \"version\" in file \"%1\".")
.arg(jsonFile.fileName());
return false;
}
@@ -484,8 +487,9 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
if (!parseConfigurePresets(root.value("configurePresets"),
m_presetsData.configurePresets,
jsonFile.parentDir())) {
errorMessage
= Tr::tr("Invalid \"configurePresets\" section in %1 file").arg(jsonFile.fileName());
errorMessage = ::CMakeProjectManager::Tr::tr(
"Invalid \"configurePresets\" section in %1 file")
.arg(jsonFile.fileName());
return false;
}
@@ -493,8 +497,8 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
if (!parseBuildPresets(root.value("buildPresets"),
m_presetsData.buildPresets,
jsonFile.parentDir())) {
errorMessage
= Tr::tr("Invalid \"buildPresets\" section in %1 file").arg(jsonFile.fileName());
errorMessage = ::CMakeProjectManager::Tr::tr("Invalid \"buildPresets\" section in %1 file")
.arg(jsonFile.fileName());
return false;
}