feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

move expandEnvVars() to QMakeGlobals

Browse Source 
fits better there

Change-Id: Id369d8e22db97affd03ed991433b898b110f1946
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-11 21:06:00 +02:00
parent 4a9b1a7a58
commit 9c46bd5dec
7 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/profileevaluator.cpp
View File

@@ -76,7 +76,7 @@ QStringList ProFileEvaluator::values(const QString &variableName) const
QStringList ret;
ret.reserve(values.size());
foreach (const ProString &str, values)
ret << d->expandEnvVars(str.toQString());
ret << d->m_option->expandEnvVars(str.toQString());
return ret;
}
@@ -88,7 +88,7 @@ QStringList ProFileEvaluator::values(const QString &variableName, const ProFile
ret.reserve(values.size());
foreach (const ProString &str, values)
if (str.sourceFile() == pro)
ret << d->expandEnvVars(str.toQString());
ret << d->m_option->expandEnvVars(str.toQString());
return ret;
}