Merge remote-tracking branch 'origin/4.5'

Change-Id: I86852d289c22210a0439e8e297819dc7276a96de
This commit is contained in:
Eike Ziller
2017-11-29 09:56:22 +01:00
17 changed files with 52 additions and 14 deletions

View File

@@ -140,11 +140,15 @@ void BackendReceiver::reset()
m_assistProcessorsTable.clear();
// Clean up futures for references
for (ReferencesEntry &entry : m_referencesTable)
for (ReferencesEntry &entry : m_referencesTable) {
entry.futureInterface.cancel();
entry.futureInterface.reportFinished();
}
m_referencesTable.clear();
for (QFutureInterface<CppTools::SymbolInfo> &futureInterface : m_followTable)
for (QFutureInterface<CppTools::SymbolInfo> &futureInterface : m_followTable) {
futureInterface.cancel();
futureInterface.reportFinished();
}
m_followTable.clear();
}