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

Fix crash on unloading Qt4 projects

Browse Source 
Change-Id: I6e05026e87ba1cf8a8e9d40fac7dd33c82f5a3ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2012-06-28 12:18:49 +02:00
parent 1776cee64b
commit 5cedb0ef38
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1478,7 +1478,7 @@ Qt4ProFileNode::~Qt4ProFileNode()
m_parseFutureWatcher.waitForFinished(); m_parseFutureWatcher.waitForFinished();
if (m_readerExact) { if (m_readerExact) {
// Oh we need to clean up // Oh we need to clean up
applyEvaluate(EvalFail, true); applyEvaluate(EvalAbort, true);
m_project->decrementPendingEvaluateFutures(); m_project->decrementPendingEvaluateFutures();
} }
} }

2
src/plugins/qt4projectmanager/qt4nodes.h
View File

@@ -382,7 +382,7 @@ private slots:
private: private:
void setupReader(); void setupReader();
enum EvalResult { EvalFail, EvalPartial, EvalOk }; enum EvalResult { EvalAbort, EvalFail, EvalPartial, EvalOk };
EvalResult evaluate(); EvalResult evaluate();
void applyEvaluate(EvalResult parseResult, bool async); void applyEvaluate(EvalResult parseResult, bool async);