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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/libs/zeroconf/embed/DebugServices.h
	tests/system/shared/project.py

Change-Id: I990f6b87ef8570317caf705bbca465a1a01f64b2
This commit is contained in:
Eike Ziller
2012-07-19 09:16:52 +02:00
parent 5b2bc8d47d 991fdc124b
commit 93cf0f126e
9 changed files with 18891 additions and 1969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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