From 4b2742e11de35eb88b439bedc0fc012b6c01e8a7 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 14 Jan 2015 11:46:30 +0100 Subject: [PATCH] Debugger: Macro expander support for debugger version and ABI Change-Id: Idd920feed7ae402a843a3854a8d2ab83b79b7076 Reviewed-by: Leena Miettinen Reviewed-by: hjk --- .../debugger/debuggerkitinformation.cpp | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index 0d64eece47..8d53d48f2d 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -306,13 +306,28 @@ void DebuggerKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expande expander->registerVariable("Debugger:Type", tr("Type of Debugger Backend"), [this, kit]() -> QString { const DebuggerItem *item = debugger(kit); - return item ? item->engineTypeName() : tr("unknown"); + return item ? item->engineTypeName() : tr("Unknown debugger type"); }); - // FIXME: Use better strings. + expander->registerVariable("Debugger:Name", tr("Debugger"), [this, kit]() -> QString { const DebuggerItem *item = debugger(kit); - return item ? item->displayName() : tr("unknown"); + return item ? item->displayName() : tr("Unknown debugger"); + }); + + expander->registerVariable("Debugger:Version", tr("Debugger"), + [this, kit]() -> QString { + const DebuggerItem *item = debugger(kit); + return item && !item->version().isEmpty() + ? item->version() : tr("Unknown debugger version"); + }); + + expander->registerVariable("Debugger:Abi", tr("Debugger"), + [this, kit]() -> QString { + const DebuggerItem *item = debugger(kit); + return item && !item->abis().isEmpty() + ? item->abiNames().join(QLatin1Char(' ')) + : tr("Unknown debugger ABI"); }); } -- GitLab