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

Qbs: More nodes work

Browse Source 
* Mark files in FileTreeNode explicitly as the cleanup will fail
  otherwise
* Mangle the basedirectory when moving nodes to unconfuse linux

Change-Id: I84186d13d1342453e9cad4065b5989d199f7a9c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-05-28 18:01:19 +02:00
parent 60378b43bf
commit f1b60ae7e8
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,8 +89,8 @@ QIcon QbsGroupNode::m_groupIcon = generateIcon();
class FileTreeNode { class FileTreeNode {
public: public:
explicit FileTreeNode(const QString &n = QString(), FileTreeNode *p = 0) : explicit FileTreeNode(const QString &n = QString(), FileTreeNode *p = 0, bool f = false) :
parent(p), name(n) parent(p), name(n), m_isFile(f)
{ {
if (p) if (p)
p->children.append(this); p->children.append(this);
@@ -101,16 +101,16 @@ public:
qDeleteAll(children); qDeleteAll(children);
} }
FileTreeNode *addPart(const QString &n) FileTreeNode *addPart(const QString &n, bool isFile)
{ {
foreach (FileTreeNode *c, children) { foreach (FileTreeNode *c, children) {
if (c->name == n) if (c->name == n)
return c; return c;
} }
return new FileTreeNode(n, this); return new FileTreeNode(n, this, isFile);
} }
bool isFile() { return children.isEmpty(); } bool isFile() { return m_isFile; }
static FileTreeNode *moveChildrenUp(FileTreeNode *node) static FileTreeNode *moveChildrenUp(FileTreeNode *node)
{ {
@@ -145,6 +145,10 @@ public:
static void reorder(FileTreeNode *node, const QString &basedir) static void reorder(FileTreeNode *node, const QString &basedir)
{ {
QTC_CHECK(!basedir.isEmpty()); QTC_CHECK(!basedir.isEmpty());
QString prefix = basedir;
if (basedir.startsWith(QLatin1Char('/')))
prefix = basedir.mid(1);
prefix.append(QLatin1Char('/'));
if (node->path() == basedir) { if (node->path() == basedir) {
// Find root node: // Find root node:
@@ -154,7 +158,7 @@ public:
foreach (FileTreeNode *c, node->children) { foreach (FileTreeNode *c, node->children) {
// Update children names by prepending basedir // Update children names by prepending basedir
c->name = basedir + QLatin1Char('/') + c->name; c->name = prefix + c->name;
// Update parent information: // Update parent information:
c->parent = root; c->parent = root;
@@ -182,7 +186,7 @@ public:
if (!node->parent) if (!node->parent)
return; return;
if (node->children.count() == 0 && !node->isFile()) { if (node->children.isEmpty() && !node->isFile()) {
// Clean up empty folder nodes: // Clean up empty folder nodes:
node->parent->children.removeOne(node); node->parent->children.removeOne(node);
node->parent = 0; node->parent = 0;
@@ -208,6 +212,7 @@ public:
QList<FileTreeNode *> children; QList<FileTreeNode *> children;
FileTreeNode *parent; FileTreeNode *parent;
QString name; QString name;
bool m_isFile;
}; };
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
@@ -362,8 +367,10 @@ void QbsGroupNode::setupFiles(QbsBaseProjectNode *root, const QStringList &files
QStringList pathSegments = path.split(QLatin1Char('/'), QString::SkipEmptyParts); QStringList pathSegments = path.split(QLatin1Char('/'), QString::SkipEmptyParts);
FileTreeNode *root = &tree; FileTreeNode *root = &tree;
while (!pathSegments.isEmpty()) while (!pathSegments.isEmpty()) {
root = root->addPart(pathSegments.takeFirst()); bool isFile = pathSegments.count() == 1;
root = root->addPart(pathSegments.takeFirst(), isFile);
}
} }
FileTreeNode::reorder(&tree, productPath); FileTreeNode::reorder(&tree, productPath);