Commit 7c9b748f authored by Daniel Teske's avatar Daniel Teske
Browse files

Fix double showing of files



Task-Number: QTCREATORBUG-6378

Change-Id: I07983b4201f6c06c3dc823527ba6299101ca50f5
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 8f7411fd
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment