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

default cumulative mode to off

Browse Source 
this is clearly more often used and thus makes for cleaner code

Change-Id: Ic8d100cbfc4134f1b73117b4f4a5aa5a6f4e0ccb
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-18 10:03:45 +02:00
parent fe68b3dc6e
commit 55dfc27c52
5 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,7 @@ QMakeEvaluator::QMakeEvaluator(QMakeGlobals *option,
// Configuration, more or less
#ifdef PROEVALUATOR_CUMULATIVE
m_cumulative = true;
m_cumulative = false;
#endif
// Evaluator state
@@ -924,9 +924,6 @@ bool QMakeEvaluator::prepareProject()
}
if (!qmake_cache.isEmpty()) {
QMakeEvaluator evaluator(m_option, m_parser, m_handler);
#ifdef PROEVALUATOR_CUMULATIVE
evaluator.m_cumulative = false;
#endif
if (!evaluator.evaluateFileDirect(qmake_cache, QMakeHandler::EvalConfigFile, LoadProOnly))
return false;
if (m_option->qmakespec.isEmpty())
@@ -940,10 +937,6 @@ bool QMakeEvaluator::prepareProject()
bool QMakeEvaluator::loadSpec()
{
#ifdef PROEVALUATOR_CUMULATIVE
m_cumulative = false;
#endif
loadDefaults();
QString qmakespec = m_option->expandEnvVars(m_option->qmakespec);
@@ -1828,9 +1821,6 @@ bool QMakeEvaluator::evaluateFileInto(
ProValueMap *values, EvalIntoMode mode)
{
QMakeEvaluator visitor(m_option, m_parser, m_handler);
#ifdef PROEVALUATOR_CUMULATIVE
visitor.m_cumulative = false;
#endif
visitor.m_outputDir = m_outputDir;
if (!visitor.evaluateFile(fileName, type,
(mode == EvalWithSetup) ? LoadAll : LoadProOnly))