Debugger: Support variables for target

Useful for e.g. substituting any build dir to current project dir. Change-Id: I50e8c101fa39bd45e55eef65776b18ef76bfd6ad Reviewed-by: hjk <hjk121@nokiamail.com>

Debugger: Support variables for target
Useful for e.g. substituting any build dir to current project dir. Change-Id: I50e8c101fa39bd45e55eef65776b18ef76bfd6ad Reviewed-by: hjk <hjk121@nokiamail.com>
c218c051 · Orgad Shaneh · hjk · 38f2487a · c218c051 · c218c051
Commit c218c051 authored Sep 21, 2014 by Orgad Shaneh Committed by hjk Sep 26, 2014
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1830,9 +1830,17 @@ void DebuggerEngine::validateExecutable(DebuggerStartParameters *sp)
        bool hasEmbeddedInfo = elfData.indexOf(".debug_info") >= 0;
        bool hasLink = elfData.indexOf(".gnu_debuglink") >= 0;
        if (hasEmbeddedInfo) {
+            QSharedPointer<GlobalDebuggerOptions> options = debuggerCore()->globalDebuggerOptions();
+            SourcePathRegExpMap globalRegExpSourceMap;
+            globalRegExpSourceMap.reserve(options->sourcePathRegExpMap.size());
+            foreach (auto entry, options->sourcePathRegExpMap) {
+                const QString expanded = VariableManager::expandedString(entry.second);
+                if (!expanded.isEmpty())
+                    globalRegExpSourceMap.push_back(qMakePair(entry.first, expanded));
+            }
+            if (globalRegExpSourceMap.isEmpty())
+                return;
            if (QSharedPointer<Utils::ElfMapper> mapper = reader.readSection(".debug_str")) {
-                QSharedPointer<GlobalDebuggerOptions> options = debuggerCore()->globalDebuggerOptions();
-                SourcePathRegExpMap globalRegExpSourceMap = options->sourcePathRegExpMap;
                const char *str = mapper->start;
                const char *limit = str + mapper->fdlen;
                while (str < limit) {

--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -30,7 +30,10 @@
 #include "debuggersourcepathmappingwidget.h"
 #include "debuggerstartparameters.h"
+#include <coreplugin/variablechooser.h>
 #include <utils/buildablehelperlibrary.h>
+#include <utils/fancylineedit.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 #include <utils/synchronousprocess.h>
@@ -205,6 +208,7 @@ DebuggerSourcePathMappingWidget::DebuggerSourcePathMappingWidget(QWidget *parent
    m_sourceLineEdit(new QLineEdit(this)),
    m_targetChooser(new PathChooser(this))
 {
+    (void)new Core::VariableChooser(this);
    setTitle(tr("Source Paths Mapping"));
    setToolTip(tr("<html><head/><body><p>Mappings of source file folders to "
                  "be used in the debugger can be entered here.</p>"
@@ -270,6 +274,7 @@ DebuggerSourcePathMappingWidget::DebuggerSourcePathMappingWidget(QWidget *parent
    editTargetLabel->setBuddy(m_targetChooser);
    m_targetChooser->setToolTip(targetToolTip);
    editLayout->addRow(editTargetLabel, m_targetChooser);
+    Core::VariableChooser::addVariableSupport(m_targetChooser->lineEdit());
    // Main layout
    QVBoxLayout *mainLayout = new QVBoxLayout;