diff options
author | dt <qtc-committer@nokia.com> | 2010-08-12 15:04:24 +0200 |
---|---|---|
committer | dt <qtc-committer@nokia.com> | 2010-08-12 15:05:05 +0200 |
commit | e05ba37ac3e812ecff4862e2bf0d5d599bdde897 (patch) | |
tree | 078ea6a941ee745a5948ea47f45276572f1a178f /src | |
parent | b160c8a06def3ef8917e96adad4578a859c6b4fb (diff) | |
download | qt-creator-e05ba37ac3e812ecff4862e2bf0d5d599bdde897.tar.gz |
Show files added to INSTALL / DEPLOYMENT
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qt4projectmanager/qt4nodes.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index fbc5097db5..b29bda9641 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -557,21 +557,31 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac folders[i] = projectDir + "/" + folders.at(i); } + + m_recursiveEnumerateFiles.clear(); // 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() || !fi.isDir()) + if (fi.exists()) { + if (fi.isDir()) { + // keep directories + ++it; + } else { + // move files directly to m_recursiveEnumerateFiles + m_recursiveEnumerateFiles << *it; + it = folders.erase(it); + } + } else { + // do remove non exsting stuff it = folders.erase(it); - else - ++it; + } } folders.removeDuplicates(); watchFolders(folders.toSet()); - m_recursiveEnumerateFiles.clear(); foreach (const QString &folder, folders) { m_recursiveEnumerateFiles += recursiveEnumerate(folder); } |