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

QbsPM: Add nodes incrementally

Browse Source 
Change-Id: Id53a0107df64b26d8ec57eda734635bda9e045f6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-03-14 16:56:28 +02:00
committed by Orgad Shaneh
parent 6815633dff
commit 5b9eaf747d
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
View File

@@ -55,15 +55,13 @@ ProjectExplorer::FileType fileType(const qbs::ArtifactData &artifact)
void setupArtifacts(ProjectExplorer::FolderNode *root, const QList<qbs::ArtifactData> &artifacts) void setupArtifacts(ProjectExplorer::FolderNode *root, const QList<qbs::ArtifactData> &artifacts)
{ {
QList<ProjectExplorer::FileNode *> fileNodes for (const qbs::ArtifactData &ad : artifacts) {
= Utils::transform(artifacts, [](const qbs::ArtifactData &ad) {
const Utils::FileName path = Utils::FileName::fromString(ad.filePath()); const Utils::FileName path = Utils::FileName::fromString(ad.filePath());
const ProjectExplorer::FileType type = fileType(ad); const ProjectExplorer::FileType type = fileType(ad);
const bool isGenerated = ad.isGenerated(); const bool isGenerated = ad.isGenerated();
return new ProjectExplorer::FileNode(path, type, isGenerated); root->addNestedNode(new ProjectExplorer::FileNode(path, type, isGenerated));
}); };
root->addNestedNodes(fileNodes);
root->compress(); root->compress();
} }
@@ -190,14 +188,12 @@ QbsRootProjectNode *QbsNodeTreeBuilder::buildTree(QbsProject *project)
ProjectExplorer::NodeType::Folder, ProjectExplorer::NodeType::Folder,
QCoreApplication::translate("QbsRootProjectNode", "Qbs files")); QCoreApplication::translate("QbsRootProjectNode", "Qbs files"));
QList<ProjectExplorer::FileNode *> projectBuildSystemFiles;
Utils::FileName base = project->projectDirectory(); Utils::FileName base = project->projectDirectory();
for (const QString &f : unreferencedBuildSystemFiles(project->qbsProject())) { for (const QString &f : unreferencedBuildSystemFiles(project->qbsProject())) {
const Utils::FileName filePath = Utils::FileName::fromString(f); const Utils::FileName filePath = Utils::FileName::fromString(f);
if (filePath.isChildOf(base)) if (filePath.isChildOf(base))
projectBuildSystemFiles.append(new ProjectExplorer::FileNode(filePath, ProjectExplorer::FileType::Project, false)); root->addNestedNode(new ProjectExplorer::FileNode(filePath, ProjectExplorer::FileType::Project, false));
} }
buildSystemFiles->addNestedNodes(projectBuildSystemFiles);
buildSystemFiles->compress(); buildSystemFiles->compress();
root->addNode(buildSystemFiles); root->addNode(buildSystemFiles);