diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp index ff1011ef819..b40ddbdb2d8 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp @@ -136,7 +136,12 @@ QStringList CMakeConfigItem::cmakeSplitValue(const QString &in, bool keepEmpty) QString CMakeConfigItem::expandedValue(const ProjectExplorer::Kit *k) const { - return k->macroExpander()->expand(QString::fromUtf8(value)); + return expandedValue(k->macroExpander()); +} + +QString CMakeConfigItem::expandedValue(const Utils::MacroExpander *expander) const +{ + return expander->expand(QString::fromUtf8(value)); } std::function CMakeConfigItem::sortOperator() diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h index 1484cffda3e..5845bec5885 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h @@ -31,6 +31,7 @@ #include namespace ProjectExplorer { class Kit; } +namespace Utils { class MacroExpander; } namespace CMakeProjectManager { @@ -49,6 +50,7 @@ public: bool isNull() const { return key.isEmpty(); } QString expandedValue(const ProjectExplorer::Kit *k) const; + QString expandedValue(const Utils::MacroExpander *expander) const; static std::function sortOperator(); static CMakeConfigItem fromString(const QString &s);