Commit c2a1d75d authored by Keith Isdale's avatar Keith Isdale

qmake's include function now supports three arguments

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

Task-number: 259398
Reviewed-by: Stian Sandvik Thomassen
parent 8d848764
......@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment