1 files changed, 10 insertions, 4 deletions
diff --git a/qmake/library/qmakeevaluator.h b/qmake/library/qmakeevaluator.h
index dc35e1ddab..f617681cbb 100644
--- a/qmake/library/qmakeevaluator.h
+++ b/qmake/library/qmakeevaluator.h
@@ -105,6 +105,8 @@ public:
     const ProValueMap &top() const { return last(); }
 };
 
+namespace QMakeInternal { struct QMakeBuiltin; }
+
 class QMAKE_EXPORT QMakeEvaluator
 {
 public:
@@ -186,6 +188,8 @@ public:
     int currentFileId() const;
     QString resolvePath(const QString &fileName) const
         { return QMakeInternal::IoUtils::resolvePath(currentDirectory(), fileName); }
+    QString filePathArg0(const ProStringList &args);
+    QString filePathEnvArg0(const ProStringList &args);
 
     VisitReturn evaluateFile(const QString &fileName, QMakeHandler::EvalFileType type,
                              LoadFlags flags);
@@ -214,8 +218,10 @@ public:
     VisitReturn evaluateExpandFunction(const ProKey &function, const ushort *&tokPtr, ProStringList *ret);
     VisitReturn evaluateConditionalFunction(const ProKey &function, const ushort *&tokPtr);
 
-    VisitReturn evaluateBuiltinExpand(int func_t, const ProKey &function, const ProStringList &args, ProStringList &ret);
-    VisitReturn evaluateBuiltinConditional(int func_t, const ProKey &function, const ProStringList &args);
+    VisitReturn evaluateBuiltinExpand(const QMakeInternal::QMakeBuiltin &adef,
+                                      const ProKey &function, const ProStringList &args, ProStringList &ret);
+    VisitReturn evaluateBuiltinConditional(const QMakeInternal::QMakeBuiltin &adef,
+                                           const ProKey &function, const ProStringList &args);
 
     VisitReturn evaluateConditional(const QStringRef &cond, const QString &where, int line = -1);
 #ifdef PROEVALUATOR_FULL
@@ -276,9 +282,9 @@ public:
 #endif
 
     struct Location {
-        Location() : pro(0), line(0) {}
+        Location() : pro(nullptr), line(0) {}
         Location(ProFile *_pro, ushort _line) : pro(_pro), line(_line) {}
-        void clear() { pro = 0; line = 0; }
+        void clear() { pro = nullptr; line = 0; }
         ProFile *pro;
         ushort line;
     };