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

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

@@ -1974,8 +1974,6 @@ bool QMakeEvaluator::evaluateFileInto(
// visitor.d->m_valuemapStack.top() = *values;
if (funcs)
visitor.d->m_functionDefs = *funcs;
if (mode == EvalWithDefaults)
visitor.d->evaluateFeatureFile(QLatin1String("default_pre.prf"));
if (!visitor.d->evaluateFile(fileName, type,
(mode == EvalWithSetup) ? LoadAll : LoadProOnly))
return false;