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

QbsProjectManager: Add project file nodes for sub-projects

Browse Source 
They got lost somehow during the project tree refactoring.

Task-number: QTCREATORBUG-17859
Change-Id: I1d1178c3d0932322604e7035f15dcc4490309ca9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2017-04-12 17:45:32 +02:00
parent b520a90644
commit 4b39baa8c1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,6 +133,10 @@ buildProductNodeTree(const qbs::Project &project, const qbs::ProductData &prd)
void setupProjectNode(QbsProjectManager::Internal::QbsProjectNode *node, const qbs::ProjectData &prjData, void setupProjectNode(QbsProjectManager::Internal::QbsProjectNode *node, const qbs::ProjectData &prjData,
const qbs::Project &qbsProject) 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()) { foreach (const qbs::ProjectData &subData, prjData.subProjects()) {
auto subProject = auto subProject =
new QbsProjectManager::Internal::QbsProjectNode( new QbsProjectManager::Internal::QbsProjectNode(
@@ -189,9 +193,7 @@ namespace Internal {
QbsRootProjectNode *QbsNodeTreeBuilder::buildTree(QbsProject *project) QbsRootProjectNode *QbsNodeTreeBuilder::buildTree(QbsProject *project)
{ {
auto root = new QbsRootProjectNode(project); auto root = new QbsRootProjectNode(project);
root->addNode(new ProjectExplorer::FileNode(project->projectFilePath(), setupProjectNode(root, project->qbsProjectData(), project->qbsProject());
ProjectExplorer::FileType::Project, false));
auto buildSystemFiles auto buildSystemFiles
= new ProjectExplorer::FolderNode(project->projectDirectory(), = new ProjectExplorer::FolderNode(project->projectDirectory(),
ProjectExplorer::NodeType::Folder, ProjectExplorer::NodeType::Folder,
@@ -206,7 +208,6 @@ QbsRootProjectNode *QbsNodeTreeBuilder::buildTree(QbsProject *project)
buildSystemFiles->compress(); buildSystemFiles->compress();
root->addNode(buildSystemFiles); root->addNode(buildSystemFiles);
setupProjectNode(root, project->qbsProjectData(), project->qbsProject());
return root; return root;
} }