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>

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 15349b4..a5ed2be 100644 (file)
--- 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 0fb8048..8dc863a 100644 (file)
--- 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: