From e27653a3d3e6b5f01f1a92041b6ddef18a6a00c4 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 29 Sep 2022 11:58:14 +0200 Subject: [PATCH] Work around lupdate issue and get rid of "Tr" context 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 --- src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp | 2 +- src/plugins/qtsupport/baseqtversion.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp index 9cabea5c042..f84763d4a51 100644 --- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp @@ -123,7 +123,7 @@ static std::unique_ptr buildProductNodeTree(const QJsonObject &p // Add "Generated Files" Node: auto genFiles = std::make_unique( FilePath::fromString(prd.value("build-directory").toString())); - genFiles->setDisplayName(Tr::tr("Generated files")); + genFiles->setDisplayName(::QbsProjectManager::Tr::tr("Generated files")); setupGeneratedArtifacts(genFiles.get(), prd); result->addNode(std::move(genFiles)); return result; diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index f908469465f..209376d7456 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1735,7 +1735,7 @@ bool QtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Environ error = &tmp; 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; }