diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 1941b5b80e4..b8db3577aa0 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -692,7 +692,7 @@ ProStringList QMakeEvaluator::evaluateExpandFunction( ProValueMap vars; QString fn = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1))); fn.detach(); - if (evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &vars, LoadProOnly)) + if (evaluateFileInto(fn, &vars, LoadProOnly)) ret = vars.value(map(args.at(1))); } break; @@ -1134,7 +1134,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction( ProValueMap vars; QString fn = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1))); fn.detach(); - if (!evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &vars, LoadProOnly)) + if (!evaluateFileInto(fn, &vars, LoadProOnly)) return ReturnFalse; if (args.count() == 2) return returnBool(vars.contains(map(args.at(1)))); @@ -1363,7 +1363,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction( ok = evaluateFile(fn, QMakeHandler::EvalIncludeFile, LoadProOnly | flags); } else { ProValueMap symbols; - if ((ok = evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &symbols, LoadAll | flags))) { + if ((ok = evaluateFileInto(fn, &symbols, LoadAll | flags))) { ProValueMap newMap; for (ProValueMap::ConstIterator it = m_valuemapStack.top().constBegin(), diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 223835506f5..81c2c23a87e 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1768,14 +1768,13 @@ bool QMakeEvaluator::evaluateFeatureFile(const QString &fileName, bool silent) return ok; } -bool QMakeEvaluator::evaluateFileInto(const QString &fileName, QMakeHandler::EvalFileType type, - ProValueMap *values, LoadFlags flags) +bool QMakeEvaluator::evaluateFileInto(const QString &fileName, ProValueMap *values, LoadFlags flags) { QMakeEvaluator visitor(m_option, m_parser, m_handler); visitor.m_caller = this; visitor.m_outputDir = m_outputDir; visitor.m_featureRoots = m_featureRoots; - if (!visitor.evaluateFile(fileName, type, flags)) + if (!visitor.evaluateFile(fileName, QMakeHandler::EvalAuxFile, flags)) return false; *values = visitor.m_valuemapStack.top(); #ifdef PROEVALUATOR_FULL diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index c6dcb60406a..e08a1f525db 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -151,7 +151,7 @@ public: bool evaluateFile(const QString &fileName, QMakeHandler::EvalFileType type, LoadFlags flags); bool evaluateFeatureFile(const QString &fileName, bool silent = false); - bool evaluateFileInto(const QString &fileName, QMakeHandler::EvalFileType type, + bool evaluateFileInto(const QString &fileName, ProValueMap *values, // output-only LoadFlags flags); void message(int type, const QString &msg) const;