Commit 2debcc28 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

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: default avatarDaniel Teske <daniel.teske@nokia.com>
parent fe87e222
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment