forked from qt-creator/qt-creator
Project: Skip duplicate files early
Change-Id: I9e2d8ce35c3f3901391c7494f1f3b60eee1bcd00 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -557,13 +557,13 @@ QStringList Project::files(Project::FilesMode fileMode,
|
|||||||
|
|
||||||
QSet<QString> alreadySeen;
|
QSet<QString> alreadySeen;
|
||||||
rootProjectNode()->forEachNode([&](const FileNode *fn) {
|
rootProjectNode()->forEachNode([&](const FileNode *fn) {
|
||||||
if (filter && !filter(fn))
|
|
||||||
return;
|
|
||||||
const QString path = fn->filePath().toString();
|
const QString path = fn->filePath().toString();
|
||||||
const int count = alreadySeen.count();
|
const int count = alreadySeen.count();
|
||||||
alreadySeen.insert(path);
|
alreadySeen.insert(path);
|
||||||
if (count == alreadySeen.count())
|
if (count == alreadySeen.count())
|
||||||
return; // skip duplicates
|
return; // skip duplicates
|
||||||
|
if (filter && !filter(fn))
|
||||||
|
return;
|
||||||
if ((fileMode == AllFiles)
|
if ((fileMode == AllFiles)
|
||||||
|| (fileMode == SourceFiles && !fn->isGenerated())
|
|| (fileMode == SourceFiles && !fn->isGenerated())
|
||||||
|| (fileMode == GeneratedFiles && fn->isGenerated()))
|
|| (fileMode == GeneratedFiles && fn->isGenerated()))
|
||||||
|
|||||||
Reference in New Issue
Block a user