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

Capitalize macro names

Browse Source 
Change-Id: I6492d625ede6c4425e5dd4b6f19a327f1931f64c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2014-10-22 14:25:15 +02:00
parent 2a240b8fab
commit 6f570684e0
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggerkitinformation.cpp
View File

@@ -304,7 +304,7 @@ KitConfigWidget *DebuggerKitInformation::createConfigWidget(Kit *k) const
void DebuggerKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) 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 { [this, kit]() -> QString {
const DebuggerItem *item = debugger(kit); const DebuggerItem *item = debugger(kit);
return item ? item->engineTypeName() : tr("unknown"); return item ? item->engineTypeName() : tr("unknown");

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

@@ -107,9 +107,9 @@ public:
m_iconPath = FileName::fromLatin1(":///DESKTOP///"); m_iconPath = FileName::fromLatin1(":///DESKTOP///");
m_macroExpander.setDisplayName(tr("Kit")); 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(); }); [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; }); [this]() { return m_fileSystemFriendlyName; });
} }

8
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -237,20 +237,20 @@ void BaseQtVersion::setupExpander()
m_expander.setDisplayName( m_expander.setDisplayName(
QCoreApplication::translate("QtSupport::QtKitInformation", "Qt version")); 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."), QCoreApplication::translate("QtSupport::QtKitInformation", "The version string of the current Qt version."),
[this]() { return qtVersionString(); }); [this]() { return qtVersionString(); });
m_expander.registerVariable("Qt:type", m_expander.registerVariable("Qt:Type",
QCoreApplication::translate("QtSupport::QtKitInformation", "The type of the current Qt version."), QCoreApplication::translate("QtSupport::QtKitInformation", "The type of the current Qt version."),
[this]() { return type(); }); [this]() { return type(); });
m_expander.registerVariable("Qt:mkspec", m_expander.registerVariable("Qt:Mkspec",
QCoreApplication::translate("QtSupport::QtKitInformation", "The mkspec of the current Qt version."), QCoreApplication::translate("QtSupport::QtKitInformation", "The mkspec of the current Qt version."),
[this]() { return mkspec().toUserOutput(); }); [this]() { return mkspec().toUserOutput(); });
// FIXME: Re-enable once we can detect expansion loops. // 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."), // QCoreApplication::translate("QtSupport::QtKitInformation", "The display name of the current Qt version."),
// [this]() { return displayName(); }); // [this]() { return displayName(); });
} }

2
src/plugins/qtsupport/qtkitinformation.cpp
View File

@@ -140,7 +140,7 @@ void QtKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expander) con
return version ? version->macroExpander() : 0; 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 { [this, kit]() -> QString {
BaseQtVersion *version = qtVersion(kit); BaseQtVersion *version = qtVersion(kit);
return version ? version->displayName() : tr("unknown"); return version ? version->displayName() : tr("unknown");