diff options
| author | dt_ <qtc-committer@nokia.com> | 2011-05-30 13:11:31 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2011-05-30 14:05:27 +0200 |
| commit | 8ea4b9700d956b2f9198439bf72dfe951cb8b56a (patch) | |
| tree | 933fe6e9c7ed48fd89bfca3864244751e5331ff2 /src/plugins/qt4projectmanager/qt4project.h | |
| parent | 6b0e6072f55404a32d3df00386a031771412656a (diff) | |
| download | qt-creator-8ea4b9700d956b2f9198439bf72dfe951cb8b56a.tar.gz | |
Qt4Project: fix canceling codemodel prevents codemodel update
After a cancel the next codemodel needs to start regardless of whether
the underlying information is still the same.
Change-Id: I24eecaf2b8f5c96904002ca1e3dbe4df0061cc9c
Reviewed-on: http://codereview.qt.nokia.com/216
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4project.h')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4project.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index c9a5f02036..169367dc77 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -250,6 +250,7 @@ private: enum AsyncUpdateState { NoState, Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown }; AsyncUpdateState m_asyncUpdateState; bool m_cancelEvaluate; + bool m_codeModelCanceled; QList<Qt4ProFileNode *> m_partialEvaluate; QFuture<void> m_codeModelFuture; |