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

qmake's include function now supports three arguments

Browse Source 
The second and third arguments to qmake's include function are
optional

Task-number: 259398
Reviewed-by: Stian Sandvik Thomassen
This commit is contained in:
Keith Isdale
2009-08-14 15:41:26 +10:00
parent 8d848764d2
commit c2a1d75daa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2530,10 +2530,12 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
if (m_skipLevel && !m_cumulative)
return ProItem::ReturnFalse;
QString parseInto;
if (args.count() == 2) {
// the third optional argument to include() controls warnings
// and is not used here
if ((args.count() == 2) || (args.count() == 3) ) {
parseInto = args[1];
} else if (args.count() != 1) {
q->logMessage(format("include(file) requires one or two arguments."));
q->logMessage(format("include(file) requires one,two or three arguments."));
return ProItem::ReturnFalse;
}
QString fileName = args.first();