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

Fix double showing of files

Browse Source 
Task-Number: QTCREATORBUG-6378

Change-Id: I07983b4201f6c06c3dc823527ba6299101ca50f5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Daniel Teske
2011-11-01 19:10:31 +01:00
parent 8f7411fdad
commit 7c9b748f22
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,6 +533,14 @@ static QSet<QString> recursiveEnumerate(const QString &folder)
return result;
}
QSet<QString> lowercaseAll(QSet<QString> strings)
{
QSet<QString> result;
foreach (const QString &s, strings)
result << s.toLower();
return result;
}
void Qt4PriFileNode::update(ProFile *includeFileExact, QtSupport::ProFileReader *readerExact, ProFile *includeFileCumlative, QtSupport::ProFileReader *readerCumulative)
{
// add project file node
@@ -590,8 +598,9 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, QtSupport::ProFileReader
foreach (const QString &folder, folders) {
m_recursiveEnumerateFiles += recursiveEnumerate(folder);
}
#ifdef Q_OS_WIN
m_recursiveEnumerateFiles = lowercaseAll(m_recursiveEnumerateFiles);
#endif
QMap<FileType, QSet<QString> > foundFiles;
QStringList baseVPathsExact;
@@ -619,6 +628,9 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, QtSupport::ProFileReader
newFilePaths += readerCumulative->absoluteFileValues(qmakeVariable, projectDir, vPathsCumulative, includeFileCumlative).toSet();
}
}
#ifdef Q_OS_WIN
newFilePaths = lowercaseAll(newFilePaths);
#endif
foundFiles[type] = newFilePaths;
m_recursiveEnumerateFiles.subtract(newFilePaths);