aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qbsprojectmanager
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-01-08 16:13:50 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2020-01-10 09:54:56 +0000
commitee87a3f068d2d451cc3c52e4952a9ec7cd01128d (patch)
tree60cda7eb27bac7d65df008ab34f7f3795984d9bb /src/plugins/qbsprojectmanager
parenta793e96ed2aed1e03c3ba499621a445a11925029 (diff)
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 <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/qbsprojectmanager')
-rw-r--r--src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp11
1 files 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<QbsProjectNode> QbsNodeTreeBuilder::buildTree(const QbsBuildSyst
auto buildSystemFiles = std::make_unique<FolderNode>(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<FileNode>(filePath, FileType::Project));
+ if (filePath.isChildOf(projectDir)) {
+ auto fileNode = std::make_unique<FileNode>(filePath, FileType::Project);
+ fileNode->setIsGenerated(filePath.isChildOf(buildDir));
+ buildSystemFiles->addNestedNode(std::move(fileNode));
+ }
}
buildSystemFiles->compress();
root->addNode(std::move(buildSystemFiles));