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

Qt4Project: Also cancel code model updates on partial .pro reevaluation

Browse Source 
It seems that not doing that was intentional. But not doing that
looks like an obvious bug.

Task-number: QTCREATORBUG-7783

Change-Id: Ide7c7be6711f64f9e8b87bca2fe35cb2722aa589
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Daniel Teske
2012-09-04 11:02:11 +02:00
parent 51433cbd84
commit 72fd0a416e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -708,6 +708,10 @@ void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node)
m_partialEvaluate.append(node); m_partialEvaluate.append(node);
// and start the timer anew // and start the timer anew
m_asyncUpdateTimer.start(); m_asyncUpdateTimer.start();
// Cancel running code model update
m_codeModelFuture.cancel();
m_codeModelCanceled = true;
} else if (m_asyncUpdateState == AsyncUpdateInProgress) { } else if (m_asyncUpdateState == AsyncUpdateInProgress) {
// A update is in progress // A update is in progress
// And this slot only gets called if a file changed on disc // And this slot only gets called if a file changed on disc