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

Debugger: move sourcePathMap back to DebuggerStartParameters

Browse Source 
It has been in use by the Mer plugin for per build-engine path
mappings.

This reverts bits of commit 244cdb7804
(Debugger: Split off runtime-only items from DebuggerStartParameters)

Change-Id: Ibba60443c52cedf51722bc71c4df67bee5f1ecec
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Martin Kampas
2015-09-23 12:45:09 +02:00
committed by Martin Kampas
parent 9d49d8147c
commit 9c6bcbcb77
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/debuggerengine.h
View File

@@ -98,7 +98,6 @@ public:
QString coreFile; QString coreFile;
QString overrideStartScript; // Used in attach to core and remote debugging QString overrideStartScript; // Used in attach to core and remote debugging
QString startMessage; // First status message shown. QString startMessage; // First status message shown.
QMap<QString, QString> sourcePathMap;
QString debugInfoLocation; // Gdb "set-debug-file-directory". QString debugInfoLocation; // Gdb "set-debug-file-directory".
QStringList debugSourceLocation; // Gdb "directory" QStringList debugSourceLocation; // Gdb "directory"
QString serverStartScript; QString serverStartScript;

3
src/plugins/debugger/debuggerstartparameters.h
View File

@@ -95,6 +95,9 @@ public:
QSsh::SshConnectionParameters connParams; QSsh::SshConnectionParameters connParams;
bool remoteSetupNeeded = false; bool remoteSetupNeeded = false;
// Used by Mer plugin (3rd party)
QMap<QString, QString> sourcePathMap;
// Used by baremetal plugin // Used by baremetal plugin
QByteArray commandsForReset; // commands used for resetting the inferior 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 bool useContinueInsteadOfRun = false; // if connected to a hw debugger run is not possible but continue is used