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

Qbs: Remove implicit Group with the same name as the Product

Browse Source 
Task-number: QBS-257

Change-Id: I63d3095a2da171a27611d2c77d4e2ca914908a06
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-04-16 16:35:53 +02:00
parent 0d5c886af3
commit 65f8e1b977
2 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -263,10 +263,11 @@ void QbsGroupNode::setGroup(const qbs::GroupData *group, const QString &productP
m_productPath = productPath; m_productPath = productPath;
// Set Product file node used to jump to the product
setPath(group->location().fileName); setPath(group->location().fileName);
setDisplayName(group->name()); setDisplayName(group->name());
// Set Product file node used to jump to the product // set up file node...
QbsFileNode *indexFile = 0; QbsFileNode *indexFile = 0;
if (!m_group) { if (!m_group) {
indexFile = new QbsFileNode(group->location().fileName, indexFile = new QbsFileNode(group->location().fileName,
@@ -280,6 +281,15 @@ void QbsGroupNode::setGroup(const qbs::GroupData *group, const QString &productP
indexFile->emitNodeUpdated(); indexFile->emitNodeUpdated();
} }
m_group = group;
setGroup(this, group, productPath, QList<ProjectExplorer::Node *>() << indexFile);
emitNodeUpdated();
}
void QbsGroupNode::setGroup(QbsBaseProjectNode *root, const qbs::GroupData *group,
const QString &productPath, QList<ProjectExplorer::Node *> keepers)
{
// Build up a tree of nodes: // Build up a tree of nodes:
FileTreeNode *tree = new FileTreeNode(QString()); FileTreeNode *tree = new FileTreeNode(QString());
@@ -293,16 +303,13 @@ void QbsGroupNode::setGroup(const qbs::GroupData *group, const QString &productP
FileTreeNode::reorder(tree, productPath, tree); FileTreeNode::reorder(tree, productPath, tree);
FileTreeNode::simplify(tree); FileTreeNode::simplify(tree);
setupFolders(this, tree, productPath, QList<ProjectExplorer::Node *>() << indexFile); setupFolders(root, root, tree, productPath, keepers);
delete tree; delete tree;
m_group = group;
emitNodeUpdated();
} }
void QbsGroupNode::setupFolders(ProjectExplorer::FolderNode *root, FileTreeNode *node, void QbsGroupNode::setupFolders(QbsBaseProjectNode *topLevel, ProjectExplorer::FolderNode *root,
const QString &baseDirPath, QList<ProjectExplorer::Node *> keepers) FileTreeNode *node, const QString &baseDirPath,
QList<ProjectExplorer::Node *> keepers)
{ {
QList<ProjectExplorer::FileNode *> filesToRemove; QList<ProjectExplorer::FileNode *> filesToRemove;
foreach (ProjectExplorer::FileNode *fn, root->fileNodes()) { foreach (ProjectExplorer::FileNode *fn, root->fileNodes()) {
@@ -338,7 +345,7 @@ void QbsGroupNode::setupFolders(ProjectExplorer::FolderNode *root, FileTreeNode
ProjectExplorer::FolderNode *fn = root->findSubFolder(path); ProjectExplorer::FolderNode *fn = root->findSubFolder(path);
if (path == baseDirPath) { if (path == baseDirPath) {
setupFolders(root, c, c->path(), foldersToKeep); setupFolders(topLevel, root, c, c->path(), foldersToKeep);
continue; continue;
} }
@@ -350,14 +357,14 @@ void QbsGroupNode::setupFolders(ProjectExplorer::FolderNode *root, FileTreeNode
foldersToRemove.removeOne(fn); foldersToRemove.removeOne(fn);
} else { } else {
fn = new ProjectExplorer::FolderNode(path); fn = new ProjectExplorer::FolderNode(path);
addFolderNodes(QList<ProjectExplorer::FolderNode *>() << fn, root); topLevel->addFolderNodes(QList<ProjectExplorer::FolderNode *>() << fn, root);
} }
foldersToKeep.append(fn); foldersToKeep.append(fn);
setupFolders(fn, c, c->path()); setupFolders(topLevel, fn, c, c->path());
} }
addFileNodes(filesToAdd, root); topLevel->removeFileNodes(filesToRemove, root);
removeFileNodes(filesToRemove, root); topLevel->removeFolderNodes(foldersToRemove, root);
removeFolderNodes(foldersToRemove, root); topLevel->addFileNodes(filesToAdd, root);
} }
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -387,28 +394,38 @@ void QbsProductNode::setProduct(const qbs::ProductData *prd)
// Set Product file node used to jump to the product // Set Product file node used to jump to the product
QList<ProjectExplorer::FileNode *> files = fileNodes(); QList<ProjectExplorer::FileNode *> files = fileNodes();
QList<ProjectExplorer::Node *> toKeep;
if (files.isEmpty()) { if (files.isEmpty()) {
addFileNodes(QList<ProjectExplorer::FileNode *>() QbsFileNode *idx = new QbsFileNode(prd->location().fileName,
<< new QbsFileNode(prd->location().fileName, ProjectExplorer::ProjectFileType, false,
ProjectExplorer::ProjectFileType, false, prd->location().line);
prd->location().line), addFileNodes(QList<ProjectExplorer::FileNode *>() << idx, this);
this); toKeep.append(idx);
} else { } else {
QbsFileNode *qbsFile = static_cast<QbsFileNode *>(files.at(0)); QbsFileNode *idx = static_cast<QbsFileNode *>(files.at(0));
qbsFile->setPath(prd->location().fileName); idx->setPath(prd->location().fileName);
qbsFile->setLine(prd->location().line); idx->setLine(prd->location().line);
toKeep.append(idx);
} }
QList<ProjectExplorer::ProjectNode *> toAdd; QList<ProjectExplorer::ProjectNode *> toAdd;
QList<ProjectExplorer::ProjectNode *> toRemove = subProjectNodes(); QList<ProjectExplorer::ProjectNode *> toRemove = subProjectNodes();
foreach (const qbs::GroupData &grp, prd->groups()) { foreach (const qbs::GroupData &grp, prd->groups()) {
if (grp.name() == prd->name() && grp.location() == prd->location()) {
// Set implicit product group right onto this node:
QbsGroupNode::setGroup(this, &grp, productPath, toKeep);
continue;
}
QbsGroupNode *qn = findGroupNode(grp.name()); QbsGroupNode *qn = findGroupNode(grp.name());
if (qn) { if (qn) {
toRemove.removeAll(qn); toRemove.removeAll(qn);
toKeep.append(qn);
qn->setGroup(&grp, productPath); qn->setGroup(&grp, productPath);
} else { } else {
toAdd << new QbsGroupNode(&grp, productPath); qn = new QbsGroupNode(&grp, productPath);
toAdd.append(qn);
toKeep.append(qn);
} }
} }

12
src/plugins/qbsprojectmanager/qbsnodes.h
View File

@@ -96,6 +96,9 @@ public:
const QString &newFilePath); const QString &newFilePath);
QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node); QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
private:
friend class QbsGroupNode;
}; };
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -115,10 +118,13 @@ public:
QString productPath() const; QString productPath() const;
static void setGroup(QbsBaseProjectNode *root, const qbs::GroupData *group,
const QString &productPath, QList<Node *> keepers);
private: private:
void setupFolders(ProjectExplorer::FolderNode *root, FileTreeNode *node, static void setupFolders(QbsBaseProjectNode *topLevel, FolderNode *root, FileTreeNode *node,
const QString &baseDirPath, const QString &baseDirPath,
QList<ProjectExplorer::Node *> keepers = QList<ProjectExplorer::Node *>()); QList<ProjectExplorer::Node *> keepers = QList<ProjectExplorer::Node *>());
const qbs::GroupData *m_group; const qbs::GroupData *m_group;
QString m_productPath; QString m_productPath;