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

evaluate qmakespec & cache without any project file on the stack

Browse Source 
they are not supposed to care for the project.
during concurrent evaluation, it would be more or less random which
subproject would trigger the spec loading anyway.

Change-Id: I46c9ef5c1461153b4ba9e7f9efdd106015d0c55b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-08 17:46:00 +02:00
parent 8e71dac965
commit 8ad7ebbd28
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -889,8 +889,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
if (!m_cumulative && !pro->isOk())
return ReturnFalse;
m_handler->aboutToEval(currentProFile(), pro, type);
m_profileStack.push(pro);
if (flags & LoadPreFiles) {
#ifdef PROEVALUATOR_THREAD_SAFE
{
@@ -967,7 +965,12 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
m_valuemapStack.top() = m_option->base_valuemap;
m_functionDefs = m_option->base_functions;
fresh:
fresh: ;
}
m_handler->aboutToEval(currentProFile(), pro, type);
m_profileStack.push(pro);
if (flags & LoadPreFiles) {
evaluateFeatureFile(QLatin1String("default_pre.prf"));
ProStringList &tgt = m_valuemapStack.top()[ProString("TARGET")];