diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-03 21:59:27 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-12 16:27:15 +0200 |
commit | 4e30c5f706439b736568206c6a53d226e21f5075 (patch) | |
tree | 9677adab75bdae193549c6027c94e33adfbf1a12 /qmake/library | |
parent | 75aa1f0ce96c9104a66c0ab416c180aa7fe66701 (diff) |
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
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/library')
-rw-r--r-- | qmake/library/qmakeevaluator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index a68e8fe5df..d7d9f1f342 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -1171,6 +1171,8 @@ bool QMakeEvaluator::loadSpec() { QMakeEvaluator evaluator(m_option, m_parser, 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( |