From 9c6bcbcb775ce809e9a43a48d6745f14bb76dea8 Mon Sep 17 00:00:00 2001 From: Martin Kampas Date: Wed, 23 Sep 2015 12:45:09 +0200 Subject: [PATCH] Debugger: move sourcePathMap back to DebuggerStartParameters It has been in use by the Mer plugin for per build-engine path mappings. This reverts bits of commit 244cdb7804e7e45f235836d4656644d5bf9135ee (Debugger: Split off runtime-only items from DebuggerStartParameters) Change-Id: Ibba60443c52cedf51722bc71c4df67bee5f1ecec Reviewed-by: hjk --- src/plugins/debugger/debuggerengine.h | 1 - src/plugins/debugger/debuggerstartparameters.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 4b840640ce5..310b1684371 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -98,7 +98,6 @@ public: QString coreFile; QString overrideStartScript; // Used in attach to core and remote debugging QString startMessage; // First status message shown. - QMap sourcePathMap; QString debugInfoLocation; // Gdb "set-debug-file-directory". QStringList debugSourceLocation; // Gdb "directory" QString serverStartScript; diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index ac680ed896f..a7b75830e58 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -95,6 +95,9 @@ public: QSsh::SshConnectionParameters connParams; bool remoteSetupNeeded = false; + // Used by Mer plugin (3rd party) + QMap sourcePathMap; + // Used by baremetal plugin QByteArray commandsForReset; // commands used for resetting the inferior bool useContinueInsteadOfRun = false; // if connected to a hw debugger run is not possible but continue is used