summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-08-14 05:36:07 (GMT)
committerKeith Isdale <keith.isdale@nokia.com>2009-08-14 05:36:07 (GMT)
commit4b1b93f3f97de70af316052bc38048f52631b9e4 (patch)
treea60e824343e7d928880106435f9eb3ebc0eeee82 /tools
parent5a3d956ae19ad411d13c7db28eb7705f4ffaad9d (diff)
downloadQt-4b1b93f3f97de70af316052bc38048f52631b9e4.zip
Qt-4b1b93f3f97de70af316052bc38048f52631b9e4.tar.gz
Qt-4b1b93f3f97de70af316052bc38048f52631b9e4.tar.bz2
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 'tools')
-rw-r--r--tools/linguist/shared/profileevaluator.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index b062dec..16eba4f 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -2145,10 +2145,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();