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

eliminate EvalIntoMode

Browse Source 
it's a relic from times of entanglement with ProFileEvaluator.

Change-Id: I903c1a8a21fcb4a0c9029d0245fba56043e62718
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-07-03 10:43:39 +02:00
parent db6f01ba4a
commit bc4c499684
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1831,14 +1831,12 @@ bool QMakeEvaluator::evaluateFeatureFile(const QString &fileName)
return ok;
}
bool QMakeEvaluator::evaluateFileInto(
const QString &fileName, QMakeHandler::EvalFileType type,
ProValueMap *values, EvalIntoMode mode)
bool QMakeEvaluator::evaluateFileInto(const QString &fileName, QMakeHandler::EvalFileType type,
ProValueMap *values, LoadFlags flags)
{
QMakeEvaluator visitor(m_option, m_parser, m_handler);
visitor.m_outputDir = m_outputDir;
if (!visitor.evaluateFile(fileName, type,
(mode == EvalWithSetup) ? LoadAll : LoadProOnly))
if (!visitor.evaluateFile(fileName, type, flags))
return false;
*values = visitor.m_valuemapStack.top();
return true;