diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-30 15:02:19 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:27 +0200 |
| commit | b2b72eea044c90135284fb2ab2c4493d92f2502c (patch) | |
| tree | e8d0f9ee01e3ca4f45d4bb5ef0dece7d300b5146 /qmake/project.cpp | |
| parent | dfbaf479c817d35d6be160fbf8939eb798753442 (diff) | |
deprecate $$IN_PWD
it suggests a symmetry to $$OUT_PWD which simply isn't there. the
shorter alias $$PWD is much more popular anyway.
Change-Id: Iefbfd56f1a3e526f15c9d6cd1bf59778be6f2f8d
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index b9e5dcdb1f..925cd613fd 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -254,6 +254,8 @@ static QString varMap(const QString &x) ret = "QMAKE_FRAMEWORKPATH"; else if(ret == "QMAKE_FRAMEWORKDIR_FLAGS") ret = "QMAKE_FRAMEWORKPATH_FLAGS"; + else if(ret == "IN_PWD") + ret = "PWD"; else return ret; warn_msg(WarnDeprecated, "%s:%d: Variable %s is deprecated; use %s instead.", @@ -3756,8 +3758,7 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringList> &place) { QString var = varMap(_var); - if (var == QLatin1String("PWD") || //current working dir (of _FILE_) - var == QLatin1String("IN_PWD")) { + if (var == QLatin1String("PWD")) { var = ".BUILTIN." + var; place[var] = QStringList(qmake_getpwd()); } else if(var == QLatin1String("_LINE_")) { //parser line number |