forked from qt-creator/qt-creator
add missing map() call
the other branch in the function also does it Change-Id: I74e27fa0bb997b95df904f5be48d1f251814c323 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
@@ -1121,7 +1121,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
|
|||||||
if (!evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &vars, LoadProOnly))
|
if (!evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &vars, LoadProOnly))
|
||||||
return ReturnFalse;
|
return ReturnFalse;
|
||||||
if (args.count() == 2)
|
if (args.count() == 2)
|
||||||
return returnBool(vars.contains(args.at(1)));
|
return returnBool(vars.contains(map(args.at(1))));
|
||||||
QRegExp regx;
|
QRegExp regx;
|
||||||
const QString &qry = args.at(2).toQString(m_tmp1);
|
const QString &qry = args.at(2).toQString(m_tmp1);
|
||||||
if (qry != QRegExp::escape(qry)) {
|
if (qry != QRegExp::escape(qry)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user