From 2debcc288171b529d873c2fdfd8315fd4492c3a5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 24 Aug 2012 17:08:59 +0200 Subject: [PATCH] make code run from $$fromfile() & infile() find features there is actually a qmake test for that. don't copy anything which is related to loading a qmakespec to the new evaluator, though - either it will actually load a spec (include(,into)) anyway, or it has a clean slate ($$fromfile() and infile()) and anything spec-related would be pointless. Change-Id: I291201a2bf823e863b3ec94be91762954612417d Reviewed-by: Daniel Teske --- src/shared/proparser/qmakeevaluator.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index d92f5ea1c79..1872965436c 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1701,6 +1701,7 @@ bool QMakeEvaluator::evaluateFileInto(const QString &fileName, QMakeHandler::Eva QMakeEvaluator visitor(m_option, m_parser, m_handler); visitor.m_caller = this; visitor.m_outputDir = m_outputDir; + visitor.m_featureRoots = m_featureRoots; if (!visitor.evaluateFile(fileName, type, flags)) return false; *values = visitor.m_valuemapStack.top();