1 files changed, 20 insertions, 2 deletions
diff --git a/qmake/library/qmakeevaluator_p.h b/qmake/library/qmakeevaluator_p.h
index f386a49108..f888bc5765 100644
--- a/qmake/library/qmakeevaluator_p.h
+++ b/qmake/library/qmakeevaluator_p.h
@@ -64,6 +64,22 @@ QT_BEGIN_NAMESPACE
 
 namespace QMakeInternal {
 
+struct QMakeBuiltinInit
+{
+    const char *name;
+    int func;
+    enum { VarArgs = 1000 };
+    int min_args, max_args;
+    const char *args;
+};
+
+struct QMakeBuiltin
+{
+    QMakeBuiltin(const QMakeBuiltinInit &data);
+    QString usage;
+    int index, minArgs, maxArgs;
+};
+
 struct QMakeStatics {
     QString field_sep;
     QString strtrue;
@@ -83,8 +99,8 @@ struct QMakeStatics {
 #ifdef PROEVALUATOR_FULL
     ProKey strREQUIRES;
 #endif
-    QHash<ProKey, int> expands;
-    QHash<ProKey, int> functions;
+    QHash<ProKey, QMakeBuiltin> expands;
+    QHash<ProKey, QMakeBuiltin> functions;
     QHash<ProKey, ProKey> varMap;
     ProStringList fakeValue;
 };
@@ -93,6 +109,8 @@ extern QMakeStatics statics;
 
 }
 
+Q_DECLARE_TYPEINFO(QMakeInternal::QMakeBuiltin, Q_MOVABLE_TYPE);
+
 QT_END_NAMESPACE
 
 #endif // QMAKEEVALUATOR_P_H