summaryrefslogtreecommitdiff
path: root/src/shared/proparser/profileevaluator.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-30 15:46:21 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-04 12:02:55 +0200
commit171531fcc92821ce0b5792bc812e47cd46c32dc8 (patch)
tree04ae93f5e0939943ab5024a0499f3f5a5d4a3080 /src/shared/proparser/profileevaluator.cpp
parent087021a23cc7d9fa44b57edfb2cc676ee1f09fe7 (diff)
downloadqt-creator-171531fcc92821ce0b5792bc812e47cd46c32dc8.tar.gz
evaluate default_pre per subproject
qt5 qmake does it Change-Id: I95cab3f6d87e4baf74e1363404fae94ca3a08eec Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/shared/proparser/profileevaluator.cpp')
-rw-r--r--src/shared/proparser/profileevaluator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 086f28e9ee..c88c07a949 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));