From 26bf2caa59b8f7ea95e551fec775c81143f8a6bb Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 22 Oct 2014 10:00:59 +0200 Subject: [PATCH] Add Kit ID to macro expansions Change-Id: Ib44c93c6708ac651f1140c2654d89344a1b12b2c Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/kit.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 243568f2949..cab64f2af10 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -72,7 +72,6 @@ class KitMacroExpander : public MacroExpander public: explicit KitMacroExpander(Kit *kit) { - setDisplayName(QCoreApplication::translate("ProjectExplorer::Kit", "Kit")); setAccumulating(true); foreach (KitInformation *ki, KitManager::kitInformation()) @@ -87,6 +86,8 @@ public: class KitPrivate { + Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::Kit) + public: KitPrivate(Id id, Kit *k) : m_id(id), @@ -104,6 +105,12 @@ public: m_unexpandedDisplayName = QCoreApplication::translate("ProjectExplorer::Kit", "Unnamed"); m_iconPath = FileName::fromLatin1(":///DESKTOP///"); + + m_macroExpander.setDisplayName(tr("Kit")); + m_macroExpander.registerVariable("Kit:id", tr("Kit ID"), + [this]() { return m_id.toString(); }); + m_macroExpander.registerVariable("Kit:fileSystemName", tr("Kit filesystem-friendly name"), + [this]() { return m_fileSystemFriendlyName; }); } QString m_unexpandedDisplayName;