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

fix c&p bug: actually use exact evaluation results

Browse Source
This commit is contained in:
Oswald Buddenhagen
2011-02-08 21:15:05 +01:00
parent 49fa40cf9e
commit 34a27d1dc5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1678,7 +1678,7 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async)
++newCumlativeIt;
}
// Update existingNodeIte
ProFile *fileExact = includeFilesCumlative.value((*existingIt)->path());
ProFile *fileExact = includeFilesExact.value((*existingIt)->path());
ProFile *fileCumlative = includeFilesCumlative.value((*existingIt)->path());
if (fileExact || fileCumlative) {
static_cast<Qt4PriFileNode *>(*existingIt)->update(fileExact, m_readerExact, fileCumlative, m_readerCumulative);
@@ -1697,7 +1697,7 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async)
}
// If we found something to add, do it
if (!nodeToAdd.isEmpty()) {
ProFile *fileExact = includeFilesCumlative.value(nodeToAdd);
ProFile *fileExact = includeFilesExact.value(nodeToAdd);
ProFile *fileCumlative = includeFilesCumlative.value(nodeToAdd);
// Loop preventation, make sure that exact same node is not in our parent chain