From 171531fcc92821ce0b5792bc812e47cd46c32dc8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 30 Apr 2012 15:46:21 +0200 Subject: [PATCH] evaluate default_pre per subproject qt5 qmake does it Change-Id: I95cab3f6d87e4baf74e1363404fae94ca3a08eec Reviewed-by: Daniel Teske Reviewed-by: Oswald Buddenhagen --- src/shared/proparser/profileevaluator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 086f28e9eef..c88c07a949e 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -1377,8 +1377,6 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::visitProFile( } } - evaluateFeatureFile(QLatin1String("default_pre.prf")); - m_option->base_valuemap = m_valuemapStack.top(); m_option->base_functions = m_functionDefs; @@ -1401,6 +1399,8 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::visitProFile( m_functionDefs = m_option->base_functions; fresh: + evaluateFeatureFile(QLatin1String("default_pre.prf")); + ProStringList &tgt = m_valuemapStack.top()[ProString("TARGET")]; if (tgt.isEmpty()) tgt.append(ProString(QFileInfo(pro->fileName()).baseName(), NoHash));