Commit 28d358b0 authored by Marc Mutz's avatar Marc Mutz Committed by Oswald Buddenhagen
Browse files

Use ProStringList::join(QChar) overload where applicable



Change-Id: I9c9964703dedfdab6e7bfac80be22bd5570e2e49
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/f4d47945ba17db276e94046473816014ed0342e9)
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent d3b425c9
......@@ -1364,7 +1364,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
// After user configs, to override them
if (!m_extraConfigs.isEmpty())
evaluateCommand(fL1S("CONFIG += ") + m_extraConfigs.join(fL1S(" ")), fL1S("(extra configs)"));
evaluateCommand(fL1S("CONFIG += ") + m_extraConfigs.join(QLatin1Char(' ')), fL1S("(extra configs)"));
}
debugMsg(1, "visiting file %s", qPrintable(pro->fileName()));
......@@ -1379,7 +1379,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
// Specifically, do not allow a project to override debug/release within a
// debug_and_release build pass - it's too late for that at this point anyway.
if (!m_extraConfigs.isEmpty())
evaluateCommand(fL1S("CONFIG += ") + m_extraConfigs.join(fL1S(" ")), fL1S("(extra configs)"));
evaluateCommand(fL1S("CONFIG += ") + m_extraConfigs.join(QLatin1Char(' ')), fL1S("(extra configs)"));
if ((vr = evaluateFeatureFile(QLatin1String("default_post.prf"))) == ReturnError)
goto failed;
......
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