summaryrefslogtreecommitdiffstats
path: root/tools/linguist/shared
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-05-20 14:35:00 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-07-20 14:30:36 +0200
commitc56cf26df98476b3679c859dfcdb7acb5f34012c (patch)
treebe482fb57f95f2966e26c345eab3dd0f3605efb5 /tools/linguist/shared
parent219f4635dab0c5a8a56753bee429ebd6c935c623 (diff)
fix return value of error() & co
cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator
Diffstat (limited to 'tools/linguist/shared')
-rw-r--r--tools/linguist/shared/profileevaluator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index 83fcb3e5ef..aadf1176f6 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -2189,7 +2189,8 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
}
QString msg = fixEnvVariables(args.first());
q->fileMessage(QString::fromLatin1("Project %1: %2").arg(function.toUpper(), msg));
- return ProItem::ReturnFalse;
+ // ### Consider real termination in non-cumulative mode
+ return returnBool(function != QLatin1String("error"));
}
#if 0 // Way too dangerous to enable.
case T_SYSTEM: {