From 30928e82e34529b15fd55185ceba843ad39a3ee8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 4 May 2012 19:19:16 +0200 Subject: [PATCH] don't use a ProFileEvaluator where a QMakeEvaluator is sufficient Change-Id: I6c0becf1a6cd8a323615a481e8fd80ed67358e3b Reviewed-by: Daniel Teske Reviewed-by: Oswald Buddenhagen --- src/shared/proparser/profileevaluator.h | 2 -- src/shared/proparser/qmakeevaluator.cpp | 17 ++++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index 404df8b62e0..570f15cc8bb 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -87,8 +87,6 @@ private: QString sysrootify(const QString &path, const QString &baseDir) const; QMakeEvaluator *d; - - friend class QMakeEvaluator; }; QT_END_NAMESPACE diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 8704856e2d1..7a5d3d9ef1c 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -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 *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; }