diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 16:57:01 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:29 +0200 |
| commit | cb4394773809100f06afed6e140411eb92851c49 (patch) | |
| tree | cb34aa651d284fd3c49b91cfb74681e63453914b /qmake | |
| parent | f85292ab206adaa43a9c8e4bfb02249cc4b2ea4d (diff) | |
make magicValues() const
the weird debugging feature is not used anyway
Change-Id: I07f481a94f2b2ab2a5b61270f0e00183cefd4cd1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 9 | ||||
| -rw-r--r-- | qmake/project.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 30b2cd2b33..45e2ee0e63 100644 --- 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 34ca8ec194..e46c7440ee 100644 --- 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: |