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

remove injection of default_pre in infile()/$$fromfile()

Browse Source 
follow suit to qmake ...

Change-Id: I6d884e284275e64e13cfea7fdc868341136c81f5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-05-04 19:16:24 +02:00
parent ac297f8e6b
commit 7257b9682e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -417,7 +417,7 @@ ProStringList QMakeEvaluator::evaluateExpandFunction(
QString fn = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1)));
fn.detach();
if (evaluateFileInto(fn, QMakeHandler::EvalAuxFile,
&vars, &m_functionDefs, EvalWithDefaults))
&vars, &m_functionDefs, EvalProOnly))
ret = vars.value(map(args.at(1)));
}
break;
@@ -705,7 +705,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
QString fn = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1)));
fn.detach();
if (!evaluateFileInto(fn, QMakeHandler::EvalAuxFile,
&vars, &m_functionDefs, EvalWithDefaults))
&vars, &m_functionDefs, EvalProOnly))
return ReturnFalse;
if (args.count() == 2)
return returnBool(vars.contains(args.at(1)));