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

Work around lupdate issue and get rid of "Tr" context

Browse Source 
For some reason lupdate doesn't find the right context and adds a "Tr"
context. Fully qualifying the call helps.

Change-Id: Ib993ad2d742a88352c9c2021184100eaa659b9b6
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2022-09-29 11:58:14 +02:00
parent ac21848acc
commit e27653a3d3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
View File

@@ -123,7 +123,7 @@ static std::unique_ptr<QbsProductNode> buildProductNodeTree(const QJsonObject &p
// Add "Generated Files" Node: // Add "Generated Files" Node:
auto genFiles = std::make_unique<VirtualFolderNode>( auto genFiles = std::make_unique<VirtualFolderNode>(
FilePath::fromString(prd.value("build-directory").toString())); FilePath::fromString(prd.value("build-directory").toString()));
genFiles->setDisplayName(Tr::tr("Generated files")); genFiles->setDisplayName(::QbsProjectManager::Tr::tr("Generated files"));
setupGeneratedArtifacts(genFiles.get(), prd); setupGeneratedArtifacts(genFiles.get(), prd);
result->addNode(std::move(genFiles)); result->addNode(std::move(genFiles));
return result; return result;

2
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1735,7 +1735,7 @@ bool QtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Environ
error = &tmp; error = &tmp;
if (!binary.isExecutableFile()) { if (!binary.isExecutableFile()) {
*error = Tr::tr("qmake \"%1\" is not an executable.").arg(binary.displayName()); *error = ::QtSupport::Tr::tr("qmake \"%1\" is not an executable.").arg(binary.displayName());
return false; return false;
} }