1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove second argument from $$eval() (access to global scope)

Browse Source 
sam added this based on a vague notion of backwards compatibility when
he fixed the function to use the local scope, but it kind of makes no
sense - there is very little reason for accessing the global scope from
within a function. google doesn't find any relevant hits except our
source code, so let's just nuke it.

Change-Id: Ie957bb47b531f7e9b5dfcceb4e09f65dd826b422
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-07-24 17:09:14 +02:00 committed by Qt by Nokia
parent c748cf489c
commit 9a8d74de0a
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qmake/project.cpp
View File

@ -2283,23 +2283,12 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
}
break; }
case E_EVAL: {
if(args.count() < 1 || args.count() > 2) {
if (args.count() != 1) {
fprintf(stderr, "%s:%d: eval(variable) requires one argument.\n",
parser.file.toLatin1().constData(), parser.line_no);
} else {
const QHash<QString, QStringList> *source = &place;
if(args.count() == 2) {
if(args.at(1) == "Global") {
source = &vars;
} else if(args.at(1) == "Local") {
source = &place;
} else {
fprintf(stderr, "%s:%d: unexpected source to eval.\n", parser.file.toLatin1().constData(),
parser.line_no);
}
}
ret += source->value(args.at(0));
ret += place.value(args.at(0));
}
break; }
case E_LIST: {