From bcda15ee9797f34357100e586075a0d9ce28b214 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 30 Jul 2009 17:03:12 +0200
Subject: [PATCH] fixEnvVariables => expandEnvVars overload
---
src/shared/proparser/profileevaluator.cpp | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index d406dd72521..e0005b509aa 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -749,6 +749,14 @@ static QString expandEnvVars(const QString &str)
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
static QString fixPathToLocalOS(const QString &str)
{
@@ -2614,23 +2622,14 @@ bool ProFileEvaluator::contains(const QString &variableName) const
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
{
- return fixEnvVariables(d->values(variableName));
+ return expandEnvVars(d->values(variableName));
}
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(
--
GitLab