diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-10-09 10:17:43 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-28 12:50:39 +0200 |
| commit | f8cd4b981041c1cb68355b4ce7f38a4397dc208e (patch) | |
| tree | 284986b68710b31c82f23777109423bf055e57f4 | |
| parent | 5c22a5eccee5a9abb47412537b5ac783353196d6 (diff) | |
| download | qttools-f8cd4b981041c1cb68355b4ce7f38a4397dc208e.tar.gz | |
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: hjk <hjk121@nokiamail.com>
| -rw-r--r-- | src/linguist/shared/qmakeevaluator.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp index 06dff33e2..98f3018a3 100644 --- a/src/linguist/shared/qmakeevaluator.cpp +++ b/src/linguist/shared/qmakeevaluator.cpp @@ -1239,10 +1239,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) |