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

add groundwork for supporting -t and -tp qmake options

Browse Source 
Change-Id: Ibb1aafdaeaf8ee53bb11436d2f2ca8ccbf0ffc3c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-18 18:13:33 +02:00
parent 705afed75d
commit d78fd3933b
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -816,8 +816,22 @@ void QMakeEvaluator::visitProVariable(
void QMakeEvaluator::setTemplate()
{
ProStringList &values = valuesRef(statics.strTEMPLATE);
if (values.isEmpty())
values.append(ProString("app", NoHash));
if (!m_option->user_template.isEmpty()) {
// Don't allow override
values = ProStringList(ProString(m_option->user_template, NoHash));
} else {
if (values.isEmpty())
values.append(ProString("app", NoHash));
else
values.erase(values.begin() + 1, values.end());
}
if (!m_option->user_template_prefix.isEmpty()) {
QString val = values.first().toQString(m_tmp1);
if (!val.startsWith(m_option->user_template_prefix)) {
val.prepend(m_option->user_template_prefix);
values = ProStringList(ProString(val, NoHash));
}
}
}
void QMakeEvaluator::loadDefaults()