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

Variable manager: Add convenience method for expanding string.

Browse Source 
Change-Id: I0e2cf4a9d39142ab3ae4c6cedb2d917822d1c1f5
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Eike Ziller
2013-03-13 14:25:47 +01:00
committed by hjk
parent c8421e66b6
commit 3a042b87a2
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/externaltool.cpp
View File

@@ -555,8 +555,7 @@ bool ExternalToolRunner::resolve()
{ // executable
QStringList expandedExecutables; /* for error message */
foreach (const QString &executable, m_tool->executables()) {
QString expanded = Utils::expandMacros(executable,
Core::VariableManager::macroExpander());
QString expanded = Core::VariableManager::expandedString(executable);
expandedExecutables << expanded;
m_resolvedExecutable =
Utils::Environment::systemEnvironment().searchInPath(expanded);
@@ -580,12 +579,10 @@ bool ExternalToolRunner::resolve()
Core::VariableManager::macroExpander());
}
{ // input
m_resolvedInput = Utils::expandMacros(m_tool->input(),
Core::VariableManager::macroExpander());
m_resolvedInput = Core::VariableManager::expandedString(m_tool->input());
}
{ // working directory
m_resolvedWorkingDirectory = Utils::expandMacros(m_tool->workingDirectory(),
Core::VariableManager::macroExpander());
m_resolvedWorkingDirectory = Core::VariableManager::expandedString(m_tool->workingDirectory());
}
return true;
}