From 119b53be83f52aa621a83a4ae1962030980ee0b4 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 9 Oct 2012 10:17:43 +0200
Subject: [PATCH] QMakeEvaluator: Set pro file as source for internal variables
Task-number: QTCREATORBUG-7006
Change-Id: I3f599f92d03b6f9fdf65b12cf4090e28cc497fbd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtcreator/6e3af2bf2e2833e0ecbc9b366af8e06abd7ecf96)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
qmake/library/qmakeevaluator.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp
index 2cfa44305c1..c60119615fb 100644
--- a/qmake/library/qmakeevaluator.cpp
+++ b/qmake/library/qmakeevaluator.cpp
@@ -1242,10 +1242,11 @@ void QMakeEvaluator::setupProject()
{
setTemplate();
ProValueMap &vars = m_valuemapStack.top();
- vars[ProKey("TARGET")] << ProString(QFileInfo(currentFileName()).baseName());
- vars[ProKey("_PRO_FILE_")] << ProString(currentFileName());
- vars[ProKey("_PRO_FILE_PWD_")] << ProString(currentDirectory());
- vars[ProKey("OUT_PWD")] << ProString(m_outputDir);
+ ProFile *proFile = currentProFile();
+ vars[ProKey("TARGET")] << ProString(QFileInfo(currentFileName()).baseName()).setSource(proFile);
+ vars[ProKey("_PRO_FILE_")] << ProString(currentFileName()).setSource(proFile);
+ vars[ProKey("_PRO_FILE_PWD_")] << ProString(currentDirectory()).setSource(proFile);
+ vars[ProKey("OUT_PWD")] << ProString(m_outputDir).setSource(proFile);
}
void QMakeEvaluator::evaluateCommand(const QString &cmds, const QString &where)
--
GitLab