From fa7d22e34888f517237861950f13efca2e40681f Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 22 Nov 2010 13:43:21 +0100
Subject: [PATCH] Qt4ProjectManager: Do not enumerate files from cumulatively
found folders
Ignore folders from cumulative parse, we are recursively enumerating all the
files from those folders and add watchers for them, that's too dangerous
if we get the foldrs wrong and enumerate the whole project tree multiple
times.
Task-Nr: QTCREATORBUG-3104
Reviewed-By: con
Reviewed-By: Alessandro Portale
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 7eca9d59bcc..b5601ed2ac2 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -548,8 +548,10 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
QStringList dynamicVariables = dynamicVarNames(readerExact, readerCumulative);
foreach (const QString &dynamicVar, dynamicVariables) {
folders += readerExact->values(dynamicVar, includeFileExact);
- if (readerCumulative)
- folders += readerCumulative->values(dynamicVar, includeFileCumlative);
+ // Ignore stuff from cumulative parse
+ // we are recursively enumerating all the files from those folders
+ // and add watchers for them, that's too dangerous if we get the foldrs
+ // wrong and enumerate the whole project tree multiple times
}
--
GitLab