From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 2 Sep 2013 14:52:47 +0000 (+0200)
Subject: make CONFIG feature evaluation failure non-fatal in cumulative mode
X-Git-Tag: accepted/tizen/20131212.181521~79^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90ee4094161b427c32581bca2f5286edb4fffdb1;p=platform%2Fupstream%2Fqttools.git

make CONFIG feature evaluation failure non-fatal in cumulative mode

while we evaluate the features themselves in precise mode (which is the
reason why they can error out), we do not want them to terminate
cumulative project evaluation.

Change-Id: I70f3e1bcb2ca04a70c74ff484749ca92c1cf6372
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---

diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp
index 8cbd7b9..4d4a1e8 100644
--- a/src/linguist/shared/qmakeevaluator.cpp
+++ b/src/linguist/shared/qmakeevaluator.cpp
@@ -1287,7 +1287,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConfigFeatures()
                 config.detach();
                 processed.insert(config);
                 VisitReturn vr = evaluateFeatureFile(config, true);
-                if (vr == ReturnError)
+                if (vr == ReturnError && !m_cumulative)
                     return vr;
                 if (vr == ReturnTrue) {
                     finished = false;