diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index 64793431d7e..8cf510f79c2 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -416,7 +416,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, EvalProOnly))
+            if (evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &vars, LoadProOnly))
                 ret = vars.value(map(args.at(1)));
         }
         break;
@@ -703,7 +703,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, EvalProOnly))
+            if (!evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &vars, LoadProOnly))
                 return ReturnFalse;
             if (args.count() == 2)
                 return returnBool(vars.contains(args.at(1)));
@@ -992,8 +992,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
             ok = evaluateFile(fn, QMakeHandler::EvalIncludeFile, LoadProOnly);
         } else {
             ProValueMap symbols;
-            if ((ok = evaluateFileInto(fn, QMakeHandler::EvalAuxFile,
-                                       &symbols, EvalWithSetup))) {
+            if ((ok = evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &symbols, LoadAll))) {
                 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 4b9c77d2a8f..64a5262996d 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -1831,14 +1831,12 @@ bool QMakeEvaluator::evaluateFeatureFile(const QString &fileName)
     return ok;
 }
 
-bool QMakeEvaluator::evaluateFileInto(
-        const QString &fileName, QMakeHandler::EvalFileType type,
-        ProValueMap *values, EvalIntoMode mode)
+bool QMakeEvaluator::evaluateFileInto(const QString &fileName, QMakeHandler::EvalFileType type,
+        ProValueMap *values, LoadFlags flags)
 {
     QMakeEvaluator visitor(m_option, m_parser, m_handler);
     visitor.m_outputDir = m_outputDir;
-    if (!visitor.evaluateFile(fileName, type,
-            (mode == EvalWithSetup) ? LoadAll : LoadProOnly))
+    if (!visitor.evaluateFile(fileName, type, flags))
         return false;
     *values = visitor.m_valuemapStack.top();
     return true;
diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h
index f19482bab9f..ed2827b55ca 100644
--- a/src/shared/proparser/qmakeevaluator.h
+++ b/src/shared/proparser/qmakeevaluator.h
@@ -140,10 +140,9 @@ public:
     bool evaluateFile(const QString &fileName, QMakeHandler::EvalFileType type,
                       LoadFlags flags);
     bool evaluateFeatureFile(const QString &fileName);
-    enum EvalIntoMode { EvalProOnly, EvalWithSetup };
     bool evaluateFileInto(const QString &fileName, QMakeHandler::EvalFileType type,
                           ProValueMap *values, // output-only
-                          EvalIntoMode mode);
+                          LoadFlags flags);
     void evalError(const QString &msg) const;
 
     QList<ProStringList> prepareFunctionArgs(const ushort *&tokPtr);