From 8777f4b9b9278c50eda47e142a805902ee2272ec Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 27 Jun 2016 15:53:47 +0200 Subject: [PATCH] Qmake: Add a macro expander to get the currently configured mkspec of a kit Change-Id: I97cd6f47c20867277ed7612a0cf5a179dedd7501 Reviewed-by: Tim Jenssen Reviewed-by: Oswald Buddenhagen --- src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 8 ++++++++ src/plugins/qmakeprojectmanager/qmakekitinformation.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index 0974c96a225..d241c255140 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -101,6 +101,14 @@ KitInformation::ItemList QmakeKitInformation::toUserOutput(const Kit *k) const return ItemList() << qMakePair(tr("mkspec"), mkspec(k).toUserOutput()); } +void QmakeKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) const +{ + expander->registerVariable("Qmake:mkspec", tr("Mkspec configured for qmake by the Kit."), + [this, kit]() -> QString { + return QmakeKitInformation::mkspec(kit).toUserOutput(); + }); +} + Core::Id QmakeKitInformation::id() { return "QtPM4.mkSpecInformation"; diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.h b/src/plugins/qmakeprojectmanager/qmakekitinformation.h index 0e77153d55f..686ece12467 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.h +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.h @@ -47,6 +47,8 @@ public: ItemList toUserOutput(const ProjectExplorer::Kit *k) const override; + void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override; + static Core::Id id(); static void setMkspec(ProjectExplorer::Kit *k, const Utils::FileName &fn); static Utils::FileName mkspec(const ProjectExplorer::Kit *k);