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>

diff --git a/qmake/project.cpp b/qmake/project.cpp
index b9e5dcd..925cd61 100644 (file)
--- 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