feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

evaluate default_pre per subproject

Browse Source 
qt5 qmake does it

Change-Id: I95cab3f6d87e4baf74e1363404fae94ca3a08eec
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-04-30 15:46:21 +02:00
parent 087021a23c
commit 171531fcc9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/profileevaluator.cpp
View File

@@ -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));