diff options
Diffstat (limited to 'src/plugins/projectexplorer/buildconfiguration.h')
-rw-r--r-- | src/plugins/projectexplorer/buildconfiguration.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index b7cada3afb..54fa99335f 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -36,12 +36,14 @@ #include "projectexplorer_export.h" #include "projectconfiguration.h" -#include <utils/stringutils.h> #include <utils/environment.h> -#include <QtCore/QString> #include <QtCore/QStringList> +namespace Utils { +class AbstractMacroExpander; +} + namespace ProjectExplorer { class BuildConfiguration; @@ -50,14 +52,6 @@ class Target; class ToolChain; class IOutputParser; -class BuildConfigMacroExpander : public Utils::AbstractQtcMacroExpander { -public: - BuildConfigMacroExpander(BuildConfiguration *bc) : m_bc(bc) {} - virtual bool resolveMacro(const QString &name, QString *ret); -private: - BuildConfiguration *m_bc; -}; - class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration { Q_OBJECT @@ -94,7 +88,7 @@ public: virtual bool isEnabled() const; virtual QString disabledReason() const; - Utils::AbstractMacroExpander *macroExpander() { return &m_macroExpander; } + Utils::AbstractMacroExpander *macroExpander(); virtual ProjectExplorer::ToolChain *toolChain() const; virtual void setToolChain(ProjectExplorer::ToolChain *tc); @@ -129,8 +123,8 @@ private: bool m_clearSystemEnvironment; QList<Utils::EnvironmentItem> m_userEnvironmentChanges; QList<BuildStepList *> m_stepLists; - BuildConfigMacroExpander m_macroExpander; ToolChain *m_toolChain; + Utils::AbstractMacroExpander *m_macroExpander; }; class PROJECTEXPLORER_EXPORT IBuildConfigurationFactory : |