From 2513c0a93f2fabbe4a0fad1433d36c8f7c0949d3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 8 Sep 2009 14:19:34 +0200
Subject: [PATCH] don't attempt to read qmake cache if there is none
evaluating a file (which might not exist) is a bit different than just
merging a (possibly empty) map ...
---
src/shared/proparser/profileevaluator.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 7495bcc7bfd..d536a03ef0f 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -1197,8 +1197,8 @@ ProItem::ProItemReturn ProFileEvaluator::Private::visitBeginProFile(ProFile * pr
if (!evaluateFileInto(spec,
&m_option->base_valuemap, &m_option->base_functions)) {
errorMessage(format("Could not read qmake configuration file %1").arg(spec));
- } else {
- evaluateFileInto(qmake_cache,
+ } else if (!m_option->cachefile.isEmpty()) {
+ evaluateFileInto(m_option->cachefile,
&m_option->base_valuemap, &m_option->base_functions);
}
}
--
GitLab