Commit fddd20ff authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

fix return() sanity check

the value map stack always has at least one map on it.

Change-Id: I836de07a14754b995403065443d3758bfc6a8683
Reviewed-by: default avatarDaniel Teske <>
Reviewed-by: default avatarOswald Buddenhagen <>
parent 12e94729
......@@ -1091,7 +1091,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
// they cannot be used to terminate loops anyway.
if (m_cumulative)
return ReturnTrue;
if (m_valuemapStack.isEmpty()) {
if (m_valuemapStack.size() == 1) {
evalError(fL1S("unexpected return()."));
return ReturnFalse;
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