From a86bdfdde40ca3bff03da590d98ee31f6d704751 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 14 May 2009 14:36:37 +0200
Subject: [PATCH] surround file inclusion with saving/restoring condition state
---
src/shared/proparser/profileevaluator.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 34e1bc37592..404602e277f 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -1782,7 +1782,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)
--
GitLab