diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-17 02:58:26 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-17 02:58:26 (GMT) |
| commit | 65d6e2c443ea31886de14736b21953fb8695eaf7 (patch) | |
| tree | 45be09de909749ff10350fdc2377c4dbf3e815d8 /tools/linguist | |
| parent | 6eab5d70003fe18ada199009d4b636765c609786 (diff) | |
| parent | 72c1cb2ffdfb2742985e12025d4578aa2fe80ce7 (diff) | |
| download | Qt-65d6e2c443ea31886de14736b21953fb8695eaf7.zip Qt-65d6e2c443ea31886de14736b21953fb8695eaf7.tar.gz Qt-65d6e2c443ea31886de14736b21953fb8695eaf7.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'tools/linguist')
| -rw-r--r-- | tools/linguist/shared/profileevaluator.cpp | 6 |
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(); |