From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 3 Jun 2013 19:59:27 +0000 (+0200)
Subject: make .qmake.{super,cache,conf} find "anchored" features
X-Git-Tag: accepted/tizen/20131212.181521~83^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=542aaa471d2c2b5be3fe613cb00568ff82d144f3;p=platform%2Fupstream%2Fqttools.git

make .qmake.{super,cache,conf} find "anchored" features

these files function as "anchors" for mkspecs/ and features/ directories
used by projects which load these files. ironically, these files didn't
see these feature files themselves.

Change-Id: I590855eb4a9d2c72b9abfcaa431d2f85a719c6e2
(cherry picked from qtbase/7456dfb4552c4e4f900af9fa8923828a23737280)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---

diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp
index 05cd204..48e4f24 100644
--- a/src/linguist/shared/qmakeevaluator.cpp
+++ b/src/linguist/shared/qmakeevaluator.cpp
@@ -1178,6 +1178,8 @@ bool QMakeEvaluator::loadSpec()
 
     {
         QMakeEvaluator evaluator(m_option, m_parser, m_vfs, m_handler);
+        evaluator.m_sourceRoot = m_sourceRoot;
+        evaluator.m_buildRoot = m_buildRoot;
         if (!m_superfile.isEmpty()) {
             valuesRef(ProKey("_QMAKE_SUPER_CACHE_")) << ProString(m_superfile);
             if (evaluator.evaluateFile(