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

Make variable manager static.

Browse Source 
This makes it follow our preferred singleton pattern.

Change-Id: I230e5ac5ef7f156da7123f7efe3a49bcb6a20669
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Eike Ziller
2013-03-11 11:52:05 +01:00
committed by hjk
parent 3d7163c628
commit e7cb32d621
15 changed files with 70 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -556,7 +556,7 @@ bool ExternalToolRunner::resolve()
QStringList expandedExecutables; /* for error message */
foreach (const QString &executable, m_tool->executables()) {
QString expanded = Utils::expandMacros(executable,
Core::VariableManager::instance()->macroExpander());
Core::VariableManager::macroExpander());
expandedExecutables << expanded;
m_resolvedExecutable =
Utils::Environment::systemEnvironment().searchInPath(expanded);
@@ -577,15 +577,15 @@ bool ExternalToolRunner::resolve()
}
{ // arguments
m_resolvedArguments = Utils::QtcProcess::expandMacros(m_tool->arguments(),
Core::VariableManager::instance()->macroExpander());
Core::VariableManager::macroExpander());
}
{ // input
m_resolvedInput = Utils::expandMacros(m_tool->input(),
Core::VariableManager::instance()->macroExpander());
Core::VariableManager::macroExpander());
}
{ // working directory
m_resolvedWorkingDirectory = Utils::expandMacros(m_tool->workingDirectory(),
Core::VariableManager::instance()->macroExpander());
Core::VariableManager::macroExpander());
}
return true;
}