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

Add Kit ID to macro expansions

Browse Source 
Change-Id: Ib44c93c6708ac651f1140c2654d89344a1b12b2c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2014-10-22 10:00:59 +02:00
parent 24626a6835
commit 26bf2caa59
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/kit.cpp
View File

@@ -72,7 +72,6 @@ class KitMacroExpander : public MacroExpander
public: public:
explicit KitMacroExpander(Kit *kit) explicit KitMacroExpander(Kit *kit)
{ {
setDisplayName(QCoreApplication::translate("ProjectExplorer::Kit", "Kit"));
setAccumulating(true); setAccumulating(true);
foreach (KitInformation *ki, KitManager::kitInformation()) foreach (KitInformation *ki, KitManager::kitInformation())
@@ -87,6 +86,8 @@ public:
class KitPrivate class KitPrivate
{ {
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::Kit)
public: public:
KitPrivate(Id id, Kit *k) : KitPrivate(Id id, Kit *k) :
m_id(id), m_id(id),
@@ -104,6 +105,12 @@ public:
m_unexpandedDisplayName = QCoreApplication::translate("ProjectExplorer::Kit", "Unnamed"); m_unexpandedDisplayName = QCoreApplication::translate("ProjectExplorer::Kit", "Unnamed");
m_iconPath = FileName::fromLatin1(":///DESKTOP///"); 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; QString m_unexpandedDisplayName;