diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 15:07:44 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:28 +0200 |
| commit | 79d6839306632d81b44e4ab01280f5220717b965 (patch) | |
| tree | 013e1ae017aa8fe2de50afc1f6f72b1f10ca5813 /qmake/project.cpp | |
| parent | 96702729c8ac7ac99066c39693ddd38c3d7e9673 (diff) | |
introduce magicValues() function
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>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 15349b4cdd..a5ed2bebaf 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -3683,7 +3683,7 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString } else if(var_type == FUNCTION) { replacement = doProjectExpand(var, args, place); } else if(var_type == VAR) { - replacement = values(var, place); + replacement = magicValues(var, place); } if(!(replaced++) && start_var) current = str.left(start_var); @@ -3758,7 +3758,7 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString 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); if (var == QLatin1String("_LINE_")) { //parser line number @@ -3772,6 +3772,12 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis 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) { QHash<QString, QStringList>::ConstIterator it = vars.constFind(varMap(v)); |