diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-14 12:30:01 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-14 12:30:01 (GMT) |
| commit | 8d846a525a67f2b0b680ed836601712a5250ce57 (patch) | |
| tree | 34fef9650992717f5d4274d8c578419ac0475698 /tools/linguist | |
| parent | 4c31f59d45130eae8f140e6d0177a4b227454187 (diff) | |
| parent | b770651f19741907cd415ea9ad6e087cb32cc948 (diff) | |
| download | Qt-8d846a525a67f2b0b680ed836601712a5250ce57.zip Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.gz Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
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(); |