From ee87a3f068d2d451cc3c52e4952a9ec7cd01128d Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 8 Jan 2020 16:13:50 +0100 Subject: [PATCH] QbsProjectManager: Properly mark generated module files Otherwise they show up under "Qbs Files" even if "hide generated headers" is on. Change-Id: I533a9ffecb06c358880be39940285461cb95b3cb Reviewed-by: Christian Stenger --- src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp index 5f7b5160a1f..bcf52a96f1f 100644 --- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp @@ -216,12 +216,17 @@ std::unique_ptr QbsNodeTreeBuilder::buildTree(const QbsBuildSyst auto buildSystemFiles = std::make_unique(project->projectDirectory()); buildSystemFiles->setDisplayName(QCoreApplication::translate("QbsProjectNode", "Qbs files")); - const FilePath base = project->projectDirectory(); + const FilePath projectDir = project->projectDirectory(); + const FilePath buildDir = FilePath::fromString(buildSystem->projectData() + .value("build-directory").toString()); const QStringList files = unreferencedBuildSystemFiles(buildSystem->projectData()); for (const QString &f : files) { const FilePath filePath = FilePath::fromString(f); - if (filePath.isChildOf(base)) - buildSystemFiles->addNestedNode(std::make_unique(filePath, FileType::Project)); + if (filePath.isChildOf(projectDir)) { + auto fileNode = std::make_unique(filePath, FileType::Project); + fileNode->setIsGenerated(filePath.isChildOf(buildDir)); + buildSystemFiles->addNestedNode(std::move(fileNode)); + } } buildSystemFiles->compress(); root->addNode(std::move(buildSystemFiles));