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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Change-Id: Ic839ab43a723ab22cc83e5b0d823ec6121cb6701
This commit is contained in:
Eike Ziller
2021-05-10 13:50:43 +02:00
parent 771f1ef6d6 c4605ebc07
commit 6bb918adab
25 changed files with 190 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -1102,10 +1102,12 @@ void CppModelManager::watchForCanceledProjectIndexer(const QFuture<void> &future
connect(watcher, &QFutureWatcher<void>::canceled, this, [this, project, watcher]() {
if (d->m_projectToIndexerCanceled.contains(project)) // Project not yet removed
d->m_projectToIndexerCanceled.insert(project, true);
watcher->disconnect(this);
watcher->deleteLater();
});
connect(watcher, &QFutureWatcher<void>::finished, this, [this, project, watcher]() {
d->m_projectToIndexerCanceled.remove(project);
watcher->disconnect(this);
watcher->deleteLater();
});
watcher->setFuture(future);