make magicValues() const

the weird debugging feature is not used anyway

Change-Id: I07f481a94f2b2ab2a5b61270f0e00183cefd4cd1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 30b2cd2..45e2ee0 100644 (file)
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -3758,17 +3758,14 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString
     return ret;
 }
 
-QStringList &QMakeProject::magicValues(const QString &_var, QHash<QString, QStringList> &place)
+QStringList QMakeProject::magicValues(const QString &_var, const QHash<QString, QStringList> &place) const
 {
     QString var = varMap(_var);
     if (var == QLatin1String("_LINE_")) { //parser line number
-        var = ".BUILTIN." + var;
-        place[var] = QStringList(QString::number(parser.line_no));
+        return QStringList(QString::number(parser.line_no));
     } else if(var == QLatin1String("_FILE_")) { //parser file
-        var = ".BUILTIN." + var;
-        place[var] = QStringList(parser.file);
+        return QStringList(parser.file);
     }
-    //qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::")));
     return place[var];
 }
 

diff --git a/qmake/project.h b/qmake/project.h
index 34ca8ec..e46c744 100644 (file)
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -117,7 +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 magicValues(const QString &v, const QHash<QString, QStringList> &place) const;
     QStringList qmakeFeaturePaths();
 
 public: