diff options
| -rw-r--r-- | qmake/project.cpp | 10 | ||||
| -rw-r--r-- | qmake/project.h | 1 |
2 files changed, 9 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)); diff --git a/qmake/project.h b/qmake/project.h index 0fb8048935..8dc863a2f8 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -117,6 +117,7 @@ class QMakeProject void loadDefaults(); void setupProject(); QStringList &values(const QString &v, QHash<QString, QStringList> &place); + QStringList &magicValues(const QString &v, QHash<QString, QStringList> &place); QStringList qmakeFeaturePaths(); public: |