diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 9bf870ce39..c4b8c150e7 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -1365,10 +1365,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile( loadDefaults(); } - for (ProValueMap::ConstIterator it = m_extraVars.constBegin(); - it != m_extraVars.constEnd(); ++it) - m_valuemapStack.first().insert(it.key(), it.value()); - VisitReturn vr; m_handler->aboutToEval(currentProFile(), pro, type); @@ -1377,6 +1373,10 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile( if (flags & LoadPreFiles) { setupProject(); + for (ProValueMap::ConstIterator it = m_extraVars.constBegin(); + it != m_extraVars.constEnd(); ++it) + m_valuemapStack.first().insert(it.key(), it.value()); + if ((vr = evaluateFeatureFile(QLatin1String("default_pre.prf"))) == ReturnError) goto failed; |