summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@nokia.com>2012-06-28 12:18:49 +0200
committerDaniel Teske <daniel.teske@nokia.com>2012-07-04 11:32:15 +0200
commit5cedb0ef38dcfa0c40219b3fb3aa3b5eedae285e (patch)
treeac8f2002812847fbf1ddc125d9cdd52e9e1bd0c5
parent1776cee64bda30ba70513b6bbec421347198a1f4 (diff)
downloadqt-creator-5cedb0ef38dcfa0c40219b3fb3aa3b5eedae285e.tar.gz
Fix crash on unloading Qt4 projects
Change-Id: I6e05026e87ba1cf8a8e9d40fac7dd33c82f5a3ff Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
-rw-r--r--src/plugins/qt4projectmanager/qt4nodes.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qt4nodes.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 6567fd440c..0a778a792e 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -1478,7 +1478,7 @@ Qt4ProFileNode::~Qt4ProFileNode()
m_parseFutureWatcher.waitForFinished();
if (m_readerExact) {
// Oh we need to clean up
- applyEvaluate(EvalFail, true);
+ applyEvaluate(EvalAbort, true);
m_project->decrementPendingEvaluateFutures();
}
}
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index 962c813e53..d87d6a810d 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -382,7 +382,7 @@ private slots:
private:
void setupReader();
- enum EvalResult { EvalFail, EvalPartial, EvalOk };
+ enum EvalResult { EvalAbort, EvalFail, EvalPartial, EvalOk };
EvalResult evaluate();
void applyEvaluate(EvalResult parseResult, bool async);