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

don't use a ProFileEvaluator where a QMakeEvaluator is sufficient

Browse Source 
Change-Id: I6c0becf1a6cd8a323615a481e8fd80ed67358e3b
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:19:16 +02:00
parent 7257b9682e
commit 30928e82e3
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@
#include "qmakeevaluator.h"
#include "profileevaluator.h"
#include "qmakeglobals.h"
#include "qmakeparser.h"
#include "qmakeevaluator_p.h"
@@ -1966,20 +1965,20 @@ bool QMakeEvaluator::evaluateFileInto(
const QString &fileName, QMakeHandler::EvalFileType type,
QHash<ProString, ProStringList> *values, ProFunctionDefs *funcs, EvalIntoMode mode)
{
ProFileEvaluator visitor(m_option, m_parser, m_handler);
QMakeEvaluator visitor(m_option, m_parser, m_handler);
#ifdef PROEVALUATOR_CUMULATIVE
visitor.d->m_cumulative = false;
visitor.m_cumulative = false;
#endif
visitor.d->m_outputDir = m_outputDir;
// visitor.d->m_valuemapStack.top() = *values;
visitor.m_outputDir = m_outputDir;
// visitor.m_valuemapStack.top() = *values;
if (funcs)
visitor.d->m_functionDefs = *funcs;
if (!visitor.d->evaluateFile(fileName, type,
visitor.m_functionDefs = *funcs;
if (!visitor.evaluateFile(fileName, type,
(mode == EvalWithSetup) ? LoadAll : LoadProOnly))
return false;
*values = visitor.d->m_valuemapStack.top();
*values = visitor.m_valuemapStack.top();
// if (funcs)
// *funcs = visitor.d->m_functionDefs;
// *funcs = visitor.m_functionDefs;
return true;
}