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

ProjectExplorer: Fix Project::setExtraProjectFiles()

Browse Source 
This function was buggy and could erroneously un-watch all the project
files after the first update.

Change-Id: I528fd8da7f873598e08f4c0177757a052fbb97ef
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-02 15:13:25 +01:00
parent c7e2ba9c14
commit 757628bf4a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/project.cpp
View File

@@ -362,8 +362,8 @@ void Project::setExtraProjectFiles(const QVector<Utils::FilePath> &projectDocume
QSet<Utils::FilePath> existingWatches = Utils::transform<QSet>(d->m_extraProjectDocuments, QSet<Utils::FilePath> existingWatches = Utils::transform<QSet>(d->m_extraProjectDocuments,
&Core::IDocument::filePath); &Core::IDocument::filePath);
QSet<Utils::FilePath> toAdd = uniqueNewFiles.subtract(existingWatches); const QSet<Utils::FilePath> toAdd = uniqueNewFiles - existingWatches;
QSet<Utils::FilePath> toRemove = existingWatches.subtract(uniqueNewFiles); const QSet<Utils::FilePath> toRemove = existingWatches - uniqueNewFiles;
Utils::erase(d->m_extraProjectDocuments, [&toRemove](const std::unique_ptr<Core::IDocument> &d) { Utils::erase(d->m_extraProjectDocuments, [&toRemove](const std::unique_ptr<Core::IDocument> &d) {
return toRemove.contains(d->filePath()); return toRemove.contains(d->filePath());