From 72fd0a416ed0eeb01026a020dbcf147f4b4b8930 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 4 Sep 2012 11:02:11 +0200 Subject: [PATCH] Qt4Project: Also cancel code model updates on partial .pro reevaluation 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 Reviewed-by: Orgad Shaneh --- src/plugins/qt4projectmanager/qt4project.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 187a144f3df..67251b95c06 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -708,6 +708,10 @@ void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node) m_partialEvaluate.append(node); // and start the timer anew m_asyncUpdateTimer.start(); + + // Cancel running code model update + m_codeModelFuture.cancel(); + m_codeModelCanceled = true; } else if (m_asyncUpdateState == AsyncUpdateInProgress) { // A update is in progress // And this slot only gets called if a file changed on disc