diff options
| -rw-r--r-- | src/plugins/projectexplorer/projectmodels.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakenodes.cpp | 6 |
2 files changed, 7 insertions, 3 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; } diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 673a27ebe3..b3886fe6c0 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -2105,6 +2105,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult) QList<ProjectNode*> toAdd; QList<ProjectNode*> toRemove; + QList<QmakePriFileNode *> toUpdate; QList<ProjectNode*>::const_iterator existingIt = existingProjectNodes.constBegin(); FileNameList::const_iterator newExactIt = result->newProjectFilesExact.constBegin(); @@ -2208,8 +2209,8 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult) QmakePriFileNode *qmakePriFileNode = new QmakePriFileNode(m_project, this, nodeToAdd); qmakePriFileNode->setParentFolderNode(this); // Needed for loop detection qmakePriFileNode->setIncludedInExactParse(fileExact != 0 && includedInExactParse()); - qmakePriFileNode->update(result->priFileResults[nodeToAdd]); toAdd << qmakePriFileNode; + toUpdate << qmakePriFileNode; } else { QmakeProFileNode *qmakeProFileNode = new QmakeProFileNode(m_project, nodeToAdd); qmakeProFileNode->setParentFolderNode(this); // Needed for loop detection @@ -2235,6 +2236,9 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult) if (!toAdd.isEmpty()) addProjectNodes(toAdd); + foreach (QmakePriFileNode *qmakePriFileNode, toUpdate) + qmakePriFileNode->update(result->priFileResults[qmakePriFileNode->path()]); + QmakePriFileNode::update(result->priFileResults[m_projectFilePath]); m_validParse = (result->state == EvalResult::EvalOk); |