From c56cf26df98476b3679c859dfcdb7acb5f34012c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 20 May 2009 14:35:00 +0200
Subject: fix return value of error() & co

cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator
---
 tools/linguist/shared/profileevaluator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/linguist/shared')

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: {
-- 
cgit v1.2.3