Commit 2513c0a9 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

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 ...
parent 37c5e2dd
......@@ -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);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment