forked from qt-creator/qt-creator
make sure every project file evaluation has basic variables set up
now that the basic variables are not magic any more, we need to make sure they are initialized. Change-Id: I75a9b66b95f84599fb9af1f4787a752319344fcb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
@@ -1034,8 +1034,6 @@ bool QMakeEvaluator::prepareProject(const QString &inDir)
|
||||
|
||||
bool QMakeEvaluator::loadSpec()
|
||||
{
|
||||
loadDefaults();
|
||||
|
||||
QString qmakespec = m_option->expandEnvVars(
|
||||
m_hostBuild ? m_option->qmakespec : m_option->xqmakespec);
|
||||
|
||||
@@ -1206,6 +1204,9 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
|
||||
#endif
|
||||
|
||||
initFrom(*baseEnv->evaluator);
|
||||
} else {
|
||||
if (m_valuemapStack.at(0).isEmpty())
|
||||
loadDefaults();
|
||||
}
|
||||
|
||||
m_handler->aboutToEval(currentProFile(), pro, type);
|
||||
|
||||
Reference in New Issue
Block a user