From a1760fc84aac0a3f28226bf40a36b403022920ed Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 12 Aug 2010 13:38:21 +0200
Subject: [PATCH] Fix lots of QFileSystemWarnings about empty lists
Also only watch folders not files.
That also removes files that are directly listed in INSTALLS /
DEPLOYMENT, I'll readd them in a later commit.
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 5 +++--
src/plugins/qt4projectmanager/qt4project.cpp | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index d42b8cb653f..fbc5097db53 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -557,11 +557,12 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
folders[i] = projectDir + "/" + folders.at(i);
}
- // Remove non existing items
+ // Remove non existing items and non folders
+ // todo fix files in INSTALL rules
QStringList::iterator it = folders.begin();
while (it != folders.end()) {
QFileInfo fi(*it);
- if (!fi.exists())
+ if (!fi.exists() || !fi.isDir())
it = folders.erase(it);
else
++it;
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index f11e6ef3430..314357f3605 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -1184,7 +1184,8 @@ void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qt4Pr
// Support for recursive watching
// we add the recursive directories we find
QSet<QString> tmp = recursiveDirs(folder);
- m_watcher.addPaths(tmp.toList());
+ if (!tmp.isEmpty())
+ m_watcher.addPaths(tmp.toList());
m_recursiveWatchedFolders += tmp;
if (debugCFW)
--
GitLab