From 00c17e9b630366121116e360cd907c66dffd8fe6 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 7 Apr 2010 15:48:06 +0200
Subject: short-cut evaluation inside if() tests

this is consistent with the top-level scope evaluation.
if() is undocumented and the old behavior would be pretty unexpected for
anyone, so i feel free to break compatibility.

Reviewed-by: joerg
---
 qmake/project.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index e3ab79d..f4933f2 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -2383,12 +2383,9 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt
                 if(d_off == d_len-1)
                     test += *(d+d_off);
                 if(!test.isEmpty()) {
-                    const bool success = doProjectTest(test, place);
-                    test = "";
-                    if(or_op)
-                        ret = ret || success;
-                    else
-                        ret = ret && success;
+                    if (or_op != ret)
+                        ret = doProjectTest(test, place);
+                    test.clear();
                 }
                 if(*(d+d_off) == QLatin1Char(':')) {
                     or_op = false;
-- 
cgit v0.12