From 542aaa471d2c2b5be3fe613cb00568ff82d144f3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Jun 2013 21:59:27 +0200 Subject: [PATCH] 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 --- src/linguist/shared/qmakeevaluator.cpp | 2 ++ 1 file changed, 2 insertions(+) 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( -- 2.7.4