diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-03 20:57:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 07:47:14 +0200 |
| commit | 849f1f9efda601bcfd3760256205a2014e0bc936 (patch) | |
| tree | 07cd4c4e4413b205a8e4e2be37e4cea5bed818cf /qmake/library/qmakeevaluator.h | |
| parent | c3c4f1eb5301a4fda17a9a48012df45f9a0ee7a3 (diff) | |
don't allow overloading of built-in functions
the functions are not versioned or scoped, so user-defined overloads would
mess up qmake's own feature files. it seems safer to break user projects
than to allow the user to break qmake.
Change-Id: I020a2e6416bbb6e2fd2ece339629d848c00c8398
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/library/qmakeevaluator.h')
| -rw-r--r-- | qmake/library/qmakeevaluator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/library/qmakeevaluator.h b/qmake/library/qmakeevaluator.h index 5904c08dbd..312b02c413 100644 --- a/qmake/library/qmakeevaluator.h +++ b/qmake/library/qmakeevaluator.h @@ -205,8 +205,8 @@ public: ProStringList evaluateExpandFunction(const ProKey &function, const ushort *&tokPtr); VisitReturn evaluateConditionalFunction(const ProKey &function, const ushort *&tokPtr); - ProStringList evaluateBuiltinExpand(const ProKey &function, const ProStringList &args); - VisitReturn evaluateBuiltinConditional(const ProKey &function, const ProStringList &args); + ProStringList evaluateBuiltinExpand(int func_t, const ProKey &function, const ProStringList &args); + VisitReturn evaluateBuiltinConditional(int func_t, const ProKey &function, const ProStringList &args); bool evaluateConditional(const QString &cond, const QString &where, int line = -1); #ifdef PROEVALUATOR_FULL |