From f5bc08b10143e888257ca64be09f9135b2328616 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 14 May 2009 14:36:37 +0200
Subject: surround file inclusion with saving/restoring condition state

cherry-picked a86bdfdde40ca3bff03da590d98ee31f6d704751 from creator
---
 tools/linguist/shared/profileevaluator.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tools/linguist/shared')

diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index c93a96ecb4..f2e6433395 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -1763,7 +1763,10 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(
             // ### this breaks if we have include(c:/reallystupid.pri) but IMHO that's really bad style.
             QDir currentProPath(currentDirectory());
             fileName = QDir::cleanPath(currentProPath.absoluteFilePath(fileName));
-            return evaluateFile(fileName);
+            State sts = m_sts;
+            bool ok = evaluateFile(fileName);
+            m_sts = sts;
+            return ok;
         }
         case T_LOAD: {
             if (m_skipLevel && !m_cumulative)
-- 
cgit v1.2.3