From 96702729c8ac7ac99066c39693ddd38c3d7e9673 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 30 Apr 2012 15:04:01 +0200
Subject: make $$PWD non-magic on read

like the other variables, we can just store it in the hash.

Change-Id: I49ad39dca8d498119b27f16ea4bdc44ae698d72e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 qmake/project.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'qmake/project.cpp')

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 00da74b003..15349b4cdd 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1300,6 +1300,7 @@ QMakeProject::read(const QString &file, QHash<QString, QStringList> &place)
         qmake_setpwd(QFileInfo(filename).absolutePath());
     }
     if(ret) {
+        place["PWD"] = QStringList(qmake_getpwd());
         parser_info pi = parser;
         parser.from_file = true;
         parser.file = filename;
@@ -1897,6 +1898,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString
     }
     parser = pi;
     qmake_setpwd(oldpwd);
+    place["PWD"] = QStringList(qmake_getpwd());
     if(!parsed)
         return IncludeParseFailure;
     return IncludeSuccess;
@@ -3759,10 +3761,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")) {
-        var = ".BUILTIN." + var;
-        place[var] = QStringList(qmake_getpwd());
-    } else if(var == QLatin1String("_LINE_")) { //parser line number
+    if (var == QLatin1String("_LINE_")) { //parser line number
         var = ".BUILTIN." + var;
         place[var] = QStringList(QString::number(parser.line_no));
     } else if(var == QLatin1String("_FILE_")) { //parser file
-- 
cgit v1.2.3