diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 078fcb1f806..7cbe2b6e03b 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1681,9 +1681,9 @@ void Qt4ProFileNode::setupReader() Q_ASSERT(!m_readerCumulative); m_readerExact = m_project->createProFileReader(this); - m_readerExact->setCumulative(false); m_readerCumulative = m_project->createProFileReader(this); + m_readerCumulative->setCumulative(true); } Qt4ProFileNode::EvalResult Qt4ProFileNode::evaluate() diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 01e3ee4b45b..fcb48e11f1c 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -726,7 +726,6 @@ void BaseQtVersion::ensureMkSpecParsed() const QMakeParser parser(ProFileCacheManager::instance()->cache(), &msgHandler); ProFileEvaluator evaluator(&option, &parser, &msgHandler); if (ProFile *pro = parser.parsedProFile(mkspecPath().toString() + QLatin1String("/qmake.conf"))) { - evaluator.setCumulative(false); evaluator.accept(pro, QMakeEvaluator::LoadProOnly); pro->deref(); } diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp index 1e97927e165..31c59b63fec 100644 --- a/src/plugins/qtsupport/qtversionfactory.cpp +++ b/src/plugins/qtsupport/qtversionfactory.cpp @@ -83,7 +83,6 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath(const Utils::FileN QMakeParser parser(ProFileCacheManager::instance()->cache(), &msgHandler); ProFileEvaluator evaluator(&globals, &parser, &msgHandler); if (ProFile *pro = parser.parsedProFile(mkspec.toString() + QLatin1String("/qmake.conf"))) { - evaluator.setCumulative(false); evaluator.accept(pro, QMakeEvaluator::LoadProOnly); pro->deref(); } diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index 570f15cc8bb..98d630c707b 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -67,7 +67,7 @@ public: ProFileEvaluator::TemplateType templateType() const; #ifdef PROEVALUATOR_CUMULATIVE - void setCumulative(bool on); // Default is true! + void setCumulative(bool on); // Default is false #endif void setOutputDir(const QString &dir); // Default is empty diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 192b3859a2e..40f48ae1a8f 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -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))