diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp index 74fdab9f532..3bef7cc433a 100644 --- a/src/libs/utils/macroexpander.cpp +++ b/src/libs/utils/macroexpander.cpp @@ -29,10 +29,11 @@ ****************************************************************************/ #include "macroexpander.h" -#include "qtcassert.h" -#include "qtcprocess.h" #include "algorithm.h" +#include "qtcassert.h" +#include "qtcprocess.h" +#include "stringutils.h" #include #include @@ -417,11 +418,6 @@ MacroExpanders MacroExpander::subExpanders() const return expanders; } -AbstractMacroExpander *MacroExpander::abstractExpander() const -{ - return d; -} - QString MacroExpander::displayName() const { return d->m_displayName; diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h index b2d87fc21e2..ae30527212a 100644 --- a/src/libs/utils/macroexpander.h +++ b/src/libs/utils/macroexpander.h @@ -31,7 +31,7 @@ #ifndef UTILS_MACROEXPANDER_H #define UTILS_MACROEXPANDER_H -#include "stringutils.h" +#include "utils_global.h" #include @@ -89,7 +89,6 @@ public: QString variableDescription(const QByteArray &variable) const; MacroExpanders subExpanders() const; - AbstractMacroExpander *abstractExpander() const; QString displayName() const; void setDisplayName(const QString &displayName); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index e66e3be0049..230b2404a90 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -126,6 +126,7 @@ #include #include #include +#include #include #include