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

Cancel code model indexing on project closing and full code model update

Browse Source 
Task-Nr: QTCREATORBUG-1151
This commit is contained in:
dt
2010-04-22 18:57:43 +02:00
parent aa3ccee492
commit f093d0806b
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -82,6 +82,7 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
GenericProject::~GenericProject()
{
m_codeModelFuture.cancel();
m_manager->unregisterProject(this);
delete m_rootNode;
@@ -238,6 +239,8 @@ void GenericProject::refresh(RefreshOptions options)
if (options & Configuration) {
filesToUpdate = pinfo.sourceFiles;
filesToUpdate.append(QLatin1String("<configuration>")); // XXX don't hardcode configuration file name
// Full update, if there's a code model update, cancel it
m_codeModelFuture.cancel();
} else if (options & Files) {
// Only update files that got added to the list
QSet<QString> newFileList = m_files.toSet();
@@ -246,7 +249,7 @@ void GenericProject::refresh(RefreshOptions options)
}
modelManager->updateProjectInfo(pinfo);
modelManager->updateSourceFiles(filesToUpdate);
m_codeModelFuture = modelManager->updateSourceFiles(filesToUpdate);
}
}