Commit 68e96f43 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Replace local macroexpander with the one from the varablemanager



They do the same thing anyway.

Change-Id: Icaa3c8226a86048356cb3a72f819c967772daa9c
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 4d5a210f
...@@ -52,26 +52,11 @@ LocalApplicationRunConfiguration::~LocalApplicationRunConfiguration() ...@@ -52,26 +52,11 @@ LocalApplicationRunConfiguration::~LocalApplicationRunConfiguration()
{ {
} }
namespace Internal {
class VarManMacroExpander : public Utils::AbstractQtcMacroExpander {
public:
virtual bool resolveMacro(const QString &name, QString *ret)
{
*ret = Core::VariableManager::instance()->value(name.toUtf8());
return !ret->isEmpty();
}
};
} // namespace Internal
Utils::AbstractMacroExpander *LocalApplicationRunConfiguration::macroExpander() const Utils::AbstractMacroExpander *LocalApplicationRunConfiguration::macroExpander() const
{ {
if (BuildConfiguration *bc = activeBuildConfiguration()) if (BuildConfiguration *bc = activeBuildConfiguration())
return bc->macroExpander(); return bc->macroExpander();
return Core::VariableManager::instance()->macroExpander();
static Internal::VarManMacroExpander mx;
return &mx;
} }
} // namespace ProjectExplorer } // namespace ProjectExplorer
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