diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-05-20 12:35:00 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-20 12:30:36 (GMT) |
| commit | c56cf26df98476b3679c859dfcdb7acb5f34012c (patch) | |
| tree | be482fb57f95f2966e26c345eab3dd0f3605efb5 /tools | |
| parent | 219f4635dab0c5a8a56753bee429ebd6c935c623 (diff) | |
| download | Qt-c56cf26df98476b3679c859dfcdb7acb5f34012c.zip Qt-c56cf26df98476b3679c859dfcdb7acb5f34012c.tar.gz Qt-c56cf26df98476b3679c859dfcdb7acb5f34012c.tar.bz2 | |
fix return value of error() & co
cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/shared/profileevaluator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 83fcb3e..aadf117 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: { |