summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-08-14 15:41:26 +1000
committerKeith Isdale <keith.isdale@nokia.com>2009-08-14 15:41:26 +1000
commitc2a1d75daa503cd94d6d7feee9e710139f5de637 (patch)
tree6a6f0ba7fe694e3fd752727613b8c88c939962bb /src/shared
parent8d848764d2912c9c6021bd1974d50e7986157418 (diff)
downloadqt-creator-c2a1d75daa503cd94d6d7feee9e710139f5de637.tar.gz
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
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/proparser/profileevaluator.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 4ad67e0a34..fe4ca39abf 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -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();