feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qmake: Add a macro expander to get the currently configured mkspec of a kit

Browse Source 
Change-Id: I97cd6f47c20867277ed7612a0cf5a179dedd7501
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-06-27 15:53:47 +02:00
parent 703c410085
commit 8777f4b9b9
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
View File

@@ -101,6 +101,14 @@ KitInformation::ItemList QmakeKitInformation::toUserOutput(const Kit *k) const
return ItemList() << qMakePair(tr("mkspec"), mkspec(k).toUserOutput()); 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() Core::Id QmakeKitInformation::id()
{ {
return "QtPM4.mkSpecInformation"; return "QtPM4.mkSpecInformation";

2
src/plugins/qmakeprojectmanager/qmakekitinformation.h
View File

@@ -47,6 +47,8 @@ public:
ItemList toUserOutput(const ProjectExplorer::Kit *k) const override; ItemList toUserOutput(const ProjectExplorer::Kit *k) const override;
void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
static Core::Id id(); static Core::Id id();
static void setMkspec(ProjectExplorer::Kit *k, const Utils::FileName &fn); static void setMkspec(ProjectExplorer::Kit *k, const Utils::FileName &fn);
static Utils::FileName mkspec(const ProjectExplorer::Kit *k); static Utils::FileName mkspec(const ProjectExplorer::Kit *k);