diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp index 7e30f661fb2..3aa957bbe5b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp @@ -203,9 +203,9 @@ QString CMakeConfigItem::expandedValue(const Utils::MacroExpander *expander) con return expander ? expander->expand(QString::fromUtf8(value)) : QString::fromUtf8(value); } -std::function CMakeConfigItem::sortOperator() +bool CMakeConfigItem::less(const CMakeConfigItem &a, const CMakeConfigItem &b) { - return [](const CMakeConfigItem &a, const CMakeConfigItem &b) { return a.key < b.key; }; + return a.key < b.key; } CMakeConfigItem CMakeConfigItem::fromString(const QString &s) @@ -393,7 +393,7 @@ QList CMakeConfigItem::itemsFromFile(const Utils::FilePath &cac } } - Utils::sort(result, CMakeConfigItem::sortOperator()); + Utils::sort(result, &CMakeConfigItem::less); return result; diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h index 7da405a48d8..73d31983d32 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h @@ -62,7 +62,7 @@ public: QString expandedValue(const ProjectExplorer::Kit *k) const; QString expandedValue(const Utils::MacroExpander *expander) const; - static std::function sortOperator(); + static bool less(const CMakeConfigItem &a, const CMakeConfigItem &b); static CMakeConfigItem fromString(const QString &s); static QList itemsFromArguments(const QStringList &list); static QList itemsFromFile(const Utils::FilePath &input, QString *errorMessage);