diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-03-13 15:40:57 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-03-16 10:41:41 +0000 |
| commit | c874e1dd73c2f152a5ff0b593d7f0c49d2f48a09 (patch) | |
| tree | 187e23bffccd7fc9f4ab857642d31f1a9be6fd95 /src/plugins/projectexplorer/projectmodels.cpp | |
| parent | 089f1b1bb3b69689aee444e478792a631b13f735 (diff) | |
| download | qt-creator-c874e1dd73c2f152a5ff0b593d7f0c49d2f48a09.tar.gz | |
QmakeProjectManager: Fix node addition order
First add the nodes, then add the subnodes. This is the correct
fix for
Change-Id: I50834ba7e0221623abe2954c88c47322677c142d
Task-number: QTCREATORBUG-14134
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/projectexplorer/projectmodels.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/projectmodels.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index ade67e9490..b699f90039 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -427,7 +427,7 @@ void FlatModel::recursiveAddFileNodes(FolderNode *startNode, QList<Node *> *list QList<Node*> FlatModel::childNodes(FolderNode *parentNode, const QSet<Node*> &blackList) const { - qCDebug(logger()) << "FlatModel::childNodes for " << parentNode->displayName(); + qCDebug(logger()) << " FlatModel::childNodes for " << parentNode->path(); QList<Node*> nodeList; if (parentNode->nodeType() == SessionNodeType) { @@ -442,7 +442,7 @@ QList<Node*> FlatModel::childNodes(FolderNode *parentNode, const QSet<Node*> &bl recursiveAddFileNodes(parentNode, &nodeList, blackList + nodeList.toSet()); } Utils::sort(nodeList, sortNodes); - qCDebug(logger()) << " found" << nodeList.size() << "nodes"; + qCDebug(logger()) << " found" << nodeList.size() << "nodes"; return nodeList; } |