From 4b39baa8c1cbcef7c78fe44815db8ae99666fb27 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 12 Apr 2017 17:45:32 +0200 Subject: [PATCH] QbsProjectManager: Add project file nodes for sub-projects They got lost somehow during the project tree refactoring. Task-number: QTCREATORBUG-17859 Change-Id: I1d1178c3d0932322604e7035f15dcc4490309ca9 Reviewed-by: Jake Petroules Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp index d6028c72edb..1f5947bd99a 100644 --- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp @@ -133,6 +133,10 @@ buildProductNodeTree(const qbs::Project &project, const qbs::ProductData &prd) void setupProjectNode(QbsProjectManager::Internal::QbsProjectNode *node, const qbs::ProjectData &prjData, const qbs::Project &qbsProject) { + using namespace QbsProjectManager::Internal; + node->addNode(new QbsFileNode(Utils::FileName::fromString(prjData.location().filePath()), + ProjectExplorer::FileType::Project, false, + prjData.location().line())); foreach (const qbs::ProjectData &subData, prjData.subProjects()) { auto subProject = new QbsProjectManager::Internal::QbsProjectNode( @@ -189,9 +193,7 @@ namespace Internal { QbsRootProjectNode *QbsNodeTreeBuilder::buildTree(QbsProject *project) { auto root = new QbsRootProjectNode(project); - root->addNode(new ProjectExplorer::FileNode(project->projectFilePath(), - ProjectExplorer::FileType::Project, false)); - + setupProjectNode(root, project->qbsProjectData(), project->qbsProject()); auto buildSystemFiles = new ProjectExplorer::FolderNode(project->projectDirectory(), ProjectExplorer::NodeType::Folder, @@ -206,7 +208,6 @@ QbsRootProjectNode *QbsNodeTreeBuilder::buildTree(QbsProject *project) buildSystemFiles->compress(); root->addNode(buildSystemFiles); - setupProjectNode(root, project->qbsProjectData(), project->qbsProject()); return root; }