Commit 6e3af2bf authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Oswald Buddenhagen
Browse files

QMakeEvaluator: Set pro file as source for internal variables



Task-number: QTCREATORBUG-7006

Change-Id: I3f599f92d03b6f9fdf65b12cf4090e28cc497fbd
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
parent 3d6f816b
...@@ -1141,10 +1141,11 @@ void QMakeEvaluator::setupProject() ...@@ -1141,10 +1141,11 @@ void QMakeEvaluator::setupProject()
{ {
setTemplate(); setTemplate();
ProValueMap &vars = m_valuemapStack.top(); ProValueMap &vars = m_valuemapStack.top();
vars[ProKey("TARGET")] << ProString(QFileInfo(currentFileName()).baseName()); ProFile *proFile = currentProFile();
vars[ProKey("_PRO_FILE_")] << ProString(currentFileName()); vars[ProKey("TARGET")] << ProString(QFileInfo(currentFileName()).baseName()).setSource(proFile);
vars[ProKey("_PRO_FILE_PWD_")] << ProString(currentDirectory()); vars[ProKey("_PRO_FILE_")] << ProString(currentFileName()).setSource(proFile);
vars[ProKey("OUT_PWD")] << ProString(m_outputDir); vars[ProKey("_PRO_FILE_PWD_")] << ProString(currentDirectory()).setSource(proFile);
vars[ProKey("OUT_PWD")] << ProString(m_outputDir).setSource(proFile);
} }
void QMakeEvaluator::visitCmdLine(const QString &cmds) void QMakeEvaluator::visitCmdLine(const QString &cmds)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment