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

Merge remote-tracking branch 'origin/master' into 9.0

Browse Source 
Change-Id: Ib6902407c879a840b927be9a545cb7c5b26c9ff8
This commit is contained in:
Eike Ziller
2022-09-30 09:47:58 +02:00
parent 1359557f77 a0f008b8e1
commit 88e9b14ca6
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:
auto genFiles = std::make_unique<VirtualFolderNode>(
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;

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

@@ -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;
}