From fd48d1fc021997cacb8276929deaa771ef4c14a7 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 5 Apr 2017 13:45:59 +0200 Subject: [PATCH] CMake: Do not add empty "" folder Do not show a "" folder if that is empty. Change-Id: Ife37691600accb176b69eba9bc7e323fa1a01ae6 Reviewed-by: Tim Jenssen --- src/plugins/cmakeprojectmanager/servermodereader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp index 92256420251..6b159474015 100644 --- a/src/plugins/cmakeprojectmanager/servermodereader.cpp +++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp @@ -664,7 +664,6 @@ void ServerModeReader::addHeaderNodes(ProjectNode *root, const QList { auto headerNode = new VirtualFolderNode(root->filePath(), Node::DefaultPriority - 5); headerNode->setDisplayName(tr("")); - root->addNode(headerNode); // knownHeaders are already listed in their targets: QSet seenHeaders = Utils::transform(knownHeaders, &FileNode::filePath); @@ -681,6 +680,11 @@ void ServerModeReader::addHeaderNodes(ProjectNode *root, const QList headerNode->addNestedNode(node); } } + + if (headerNode->nodes().isEmpty()) + delete headerNode; // No Headers, do not show this Folder. + else + root->addNode(headerNode); } } // namespace Internal