From 6f570684e04cb7f10b6636868a7c3e4a34862a71 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 22 Oct 2014 14:25:15 +0200 Subject: [PATCH] Capitalize macro names Change-Id: I6492d625ede6c4425e5dd4b6f19a327f1931f64c Reviewed-by: Orgad Shaneh --- src/plugins/debugger/debuggerkitinformation.cpp | 2 +- src/plugins/projectexplorer/kit.cpp | 4 ++-- src/plugins/qtsupport/baseqtversion.cpp | 8 ++++---- src/plugins/qtsupport/qtkitinformation.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index 12af19eda06..6369444fd58 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -304,7 +304,7 @@ KitConfigWidget *DebuggerKitInformation::createConfigWidget(Kit *k) const void DebuggerKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) const { - expander->registerVariable("Debugger:engineType", tr("Type of Debugger Backend"), + expander->registerVariable("Debugger:EngineType", tr("Type of Debugger Backend"), [this, kit]() -> QString { const DebuggerItem *item = debugger(kit); return item ? item->engineTypeName() : tr("unknown"); diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index cab64f2af10..582eb464d5f 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -107,9 +107,9 @@ public: m_iconPath = FileName::fromLatin1(":///DESKTOP///"); m_macroExpander.setDisplayName(tr("Kit")); - m_macroExpander.registerVariable("Kit:id", tr("Kit ID"), + m_macroExpander.registerVariable("Kit:Id", tr("Kit ID"), [this]() { return m_id.toString(); }); - m_macroExpander.registerVariable("Kit:fileSystemName", tr("Kit filesystem-friendly name"), + m_macroExpander.registerVariable("Kit:FileSystemName", tr("Kit filesystem-friendly name"), [this]() { return m_fileSystemFriendlyName; }); } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index b21f2cec042..aa3dc1034c8 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -237,20 +237,20 @@ void BaseQtVersion::setupExpander() m_expander.setDisplayName( QCoreApplication::translate("QtSupport::QtKitInformation", "Qt version")); - m_expander.registerVariable("Qt:version", + m_expander.registerVariable("Qt:Version", QCoreApplication::translate("QtSupport::QtKitInformation", "The version string of the current Qt version."), [this]() { return qtVersionString(); }); - m_expander.registerVariable("Qt:type", + m_expander.registerVariable("Qt:Type", QCoreApplication::translate("QtSupport::QtKitInformation", "The type of the current Qt version."), [this]() { return type(); }); - m_expander.registerVariable("Qt:mkspec", + m_expander.registerVariable("Qt:Mkspec", QCoreApplication::translate("QtSupport::QtKitInformation", "The mkspec of the current Qt version."), [this]() { return mkspec().toUserOutput(); }); // FIXME: Re-enable once we can detect expansion loops. -// m_expander.registerVariable("Qt:name", +// m_expander.registerVariable("Qt:Name", // QCoreApplication::translate("QtSupport::QtKitInformation", "The display name of the current Qt version."), // [this]() { return displayName(); }); } diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 51d0e3d418b..a8c49bddfb9 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -140,7 +140,7 @@ void QtKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) con return version ? version->macroExpander() : 0; }); - expander->registerVariable("Qt:name", tr("Name of Qt Version"), + expander->registerVariable("Qt:Name", tr("Name of Qt Version"), [this, kit]() -> QString { BaseQtVersion *version = qtVersion(kit); return version ? version->displayName() : tr("unknown");