From c6a0ca7bc8ba790cc9471d2921ad1860cb226a6e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 12 Jun 2012 21:43:29 +0200
Subject: [PATCH] make project-related variables non-magic

follow suit with qmake ...

Change-Id: I88b4edd12569dcd59d7eed0512cc16d14f2c685e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
 src/shared/proparser/qmakeevaluator.cpp | 15 ++++-----------
 src/shared/proparser/qmakeevaluator.h   |  3 +--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index 1b20a681d13..5cd43a1f6fc 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -96,8 +96,7 @@ void QMakeEvaluator::initStatics()
     initFunctionStatics();
 
     static const char * const names[] = {
-        "OUT_PWD", "PWD",
-        "_PRO_FILE_", "_PRO_FILE_PWD_"
+        "PWD"
     };
     for (unsigned i = 0; i < sizeof(names)/sizeof(names[0]); ++i)
         statics.varList.insert(ProString(names[i]), i);
@@ -1004,6 +1003,9 @@ void QMakeEvaluator::setupProject()
     setTemplate();
     ProValueMap &vars = m_valuemapStack.top();
     vars[ProString("TARGET")] << ProString(QFileInfo(currentFileName()).baseName(), NoHash);
+    vars[ProString("_PRO_FILE_")] << ProString(currentFileName(), NoHash);
+    vars[ProString("_PRO_FILE_PWD_")] << ProString(currentDirectory(), NoHash);
+    vars[ProString("OUT_PWD")] << ProString(m_outputDir, NoHash);
 }
 
 void QMakeEvaluator::visitCmdLine(const QString &cmds)
@@ -1739,18 +1741,9 @@ ProStringList QMakeEvaluator::values(const ProString &variableName) const
         int vlidx = *vli;
         QString ret;
         switch ((VarName)vlidx) {
-        case V_OUT_PWD: // the outgoing dir (shadow of _PRO_FILE_PWD_)
-            ret = m_outputDir;
-            break;
         case V_PWD: // containing directory of most nested project/include file
             ret = currentDirectory();
             break;
-        case V__PRO_FILE_:
-            ret = m_profileStack.first()->fileName();
-            break;
-        case V__PRO_FILE_PWD_:
-            ret = m_profileStack.first()->directoryName();
-            break;
         }
         return ProStringList(ProString(ret, NoHash));
     }
diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h
index 870933aa04e..3d4e621041b 100644
--- a/src/shared/proparser/qmakeevaluator.h
+++ b/src/shared/proparser/qmakeevaluator.h
@@ -210,8 +210,7 @@ public:
     QMakeHandler *m_handler;
 
     enum VarName {
-        V_OUT_PWD, V_PWD,
-        V__PRO_FILE_, V__PRO_FILE_PWD_
+        V_PWD
     };
 };