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

fixEnvVariables => expandEnvVars overload

parent 0d0860a0
...@@ -749,6 +749,14 @@ static QString expandEnvVars(const QString &str) ...@@ -749,6 +749,14 @@ static QString expandEnvVars(const QString &str)
return string; return string;
} }
static QStringList expandEnvVars(const QStringList &x)
{
QStringList ret;
foreach (const QString &str, x)
ret << expandEnvVars(str);
return ret;
}
// This is braindead, but we want qmake compat // This is braindead, but we want qmake compat
static QString fixPathToLocalOS(const QString &str) static QString fixPathToLocalOS(const QString &str)
{ {
...@@ -2614,23 +2622,14 @@ bool ProFileEvaluator::contains(const QString &variableName) const ...@@ -2614,23 +2622,14 @@ bool ProFileEvaluator::contains(const QString &variableName) const
return d->m_valuemap.contains(variableName); return d->m_valuemap.contains(variableName);
} }
inline QStringList fixEnvVariables(const QStringList &x)
{
QStringList ret;
foreach (const QString &str, x)
ret << expandEnvVars(str);
return ret;
}
QStringList ProFileEvaluator::values(const QString &variableName) const QStringList ProFileEvaluator::values(const QString &variableName) const
{ {
return fixEnvVariables(d->values(variableName)); return expandEnvVars(d->values(variableName));
} }
QStringList ProFileEvaluator::values(const QString &variableName, const ProFile *pro) const QStringList ProFileEvaluator::values(const QString &variableName, const ProFile *pro) const
{ {
return fixEnvVariables(d->values(variableName, pro)); return expandEnvVars(d->values(variableName, pro));
} }
QStringList ProFileEvaluator::absolutePathValues( QStringList ProFileEvaluator::absolutePathValues(
......
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