diff options
| author | hjk <hjk@theqtcompany.com> | 2016-03-22 12:21:01 +0100 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2016-03-30 12:01:40 +0000 |
| commit | 6b805c217273b9d169aa7e8a78949e17179016bf (patch) | |
| tree | 6197909bc15687b43df0523c5fabda1dcf40f14c /src | |
| parent | e6ff36bd44b641614810c1520a5f42cb83480bd8 (diff) | |
| download | qt-creator-6b805c217273b9d169aa7e8a78949e17179016bf.tar.gz | |
ProjectExplorer: Make current sysroot accessible to macro expanders
Change-Id: I16333c33d2fff4ebf4125d5c0c1532b5972cc480
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/projectexplorer/kitinformation.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/kitinformation.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index d2d9fece2e..d1bb33b744 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -83,6 +83,13 @@ KitInformation::ItemList SysRootKitInformation::toUserOutput(const Kit *k) const return ItemList() << qMakePair(tr("Sys Root"), sysRoot(k).toUserOutput()); } +void SysRootKitInformation::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const +{ + expander->registerFileVariables("SysRoot", tr("Sys Root"), [this, kit]() -> QString { + return SysRootKitInformation::sysRoot(kit).toString(); + }); +} + Core::Id SysRootKitInformation::id() { return "PE.Profile.SysRoot"; diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index ca49e57ad3..49054fcfb0 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -56,6 +56,7 @@ public: KitConfigWidget *createConfigWidget(Kit *k) const override; ItemList toUserOutput(const Kit *k) const override; + void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override; static Core::Id id(); static bool hasSysRoot(const Kit *k); |