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

introduce magicValues() function

Browse Source 
the only place where the two remaining magic values need to be
referencable is doVariableReplaceExpand(), so make a separate function
and use it only in that place.

Change-Id: I6e2fcfa3a4f16727d90ace56eb88fc99ef272ffc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-23 15:07:44 +02:00
parent 96702729c8
commit 79d6839306
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/project.cpp
View File

@ -3683,7 +3683,7 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString
} else if(var_type == FUNCTION) { } else if(var_type == FUNCTION) {
replacement = doProjectExpand(var, args, place); replacement = doProjectExpand(var, args, place);
} else if(var_type == VAR) { } else if(var_type == VAR) {
replacement = values(var, place); replacement = magicValues(var, place);
} }
if(!(replaced++) && start_var) if(!(replaced++) && start_var)
current = str.left(start_var); current = str.left(start_var);
@ -3758,7 +3758,7 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString
return ret; return ret;
} }
QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringList> &place) QStringList &QMakeProject::magicValues(const QString &_var, QHash<QString, QStringList> &place)
{ {
QString var = varMap(_var); QString var = varMap(_var);
if (var == QLatin1String("_LINE_")) { //parser line number if (var == QLatin1String("_LINE_")) { //parser line number
@ -3772,6 +3772,12 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis
return place[var]; return place[var];
} }
QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringList> &place)
{
QString var = varMap(_var);
return place[var];
}
bool QMakeProject::isEmpty(const QString &v) bool QMakeProject::isEmpty(const QString &v)
{ {
QHash<QString, QStringList>::ConstIterator it = vars.constFind(varMap(v)); QHash<QString, QStringList>::ConstIterator it = vars.constFind(varMap(v));

1
qmake/project.h
View File

@ -117,6 +117,7 @@ class QMakeProject
void loadDefaults(); void loadDefaults();
void setupProject(); void setupProject();
QStringList &values(const QString &v, QHash<QString, QStringList> &place); QStringList &values(const QString &v, QHash<QString, QStringList> &place);
QStringList &magicValues(const QString &v, QHash<QString, QStringList> &place);
QStringList qmakeFeaturePaths(); QStringList qmakeFeaturePaths();
public: public: