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

Debugger: Transform DebuggerRunParameters::additionalStartupCommands

Browse Source 
Task-number: QTCREATORBUG-29168
Change-Id: I6acf7586e3689c799e7038a48b0638365de1889c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-13 10:29:47 +01:00
parent 17638333b9
commit 3a88493719
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/dap/lldbdapengine.cpp
View File

@@ -131,7 +131,7 @@ QJsonArray LldbDapEngine::sourceMap() const
QJsonArray LldbDapEngine::preRunCommands() const QJsonArray LldbDapEngine::preRunCommands() const
{ {
const QStringList lines = settings().gdbStartupCommands().split('\n') const QStringList lines = settings().gdbStartupCommands().split('\n')
+ runParameters().additionalStartupCommands.split('\n'); + runParameters().additionalStartupCommands().split('\n');
QJsonArray result; QJsonArray result;
for (const QString &line : lines) { for (const QString &line : lines) {
const QString trimmed = line.trimmed(); const QString trimmed = line.trimmed();

4
src/plugins/debugger/debuggerengine.cpp
View File

@@ -151,7 +151,7 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run
params.m_isQmlDebugging = aspect->useQmlDebugger; params.m_isQmlDebugging = aspect->useQmlDebugger;
params.isPythonDebugging = aspect->usePythonDebugger; params.isPythonDebugging = aspect->usePythonDebugger;
params.multiProcess = aspect->useMultiProcess; params.multiProcess = aspect->useMultiProcess;
params.additionalStartupCommands = aspect->overrideStartup; params.m_additionalStartupCommands = aspect->overrideStartup;
if (aspect->useCppDebugger) { if (aspect->useCppDebugger) {
if (DebuggerKitAspect::debugger(kit)) { if (DebuggerKitAspect::debugger(kit)) {
@@ -2144,7 +2144,7 @@ QString DebuggerEngine::expand(const QString &string) const
QString DebuggerEngine::nativeStartupCommands() const QString DebuggerEngine::nativeStartupCommands() const
{ {
QStringList lines = settings().gdbStartupCommands().split('\n'); QStringList lines = settings().gdbStartupCommands().split('\n');
lines += runParameters().additionalStartupCommands.split('\n'); lines += runParameters().additionalStartupCommands().split('\n');
lines = Utils::filtered(lines, [](const QString line) { lines = Utils::filtered(lines, [](const QString line) {
const QString trimmed = line.trimmed(); const QString trimmed = line.trimmed();

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

@@ -176,8 +176,7 @@ public:
void setSnapshot(bool isSnapshot) { m_isSnapshot = isSnapshot; } void setSnapshot(bool isSnapshot) { m_isSnapshot = isSnapshot; }
bool isSnapshot() const { return m_isSnapshot; } bool isSnapshot() const { return m_isSnapshot; }
// Macro-expanded and passed to debugger startup. QString additionalStartupCommands() const { return m_additionalStartupCommands; }
QString additionalStartupCommands;
DebuggerEngineType cppEngineType = NoEngineType; DebuggerEngineType cppEngineType = NoEngineType;
QString version; QString version;
@@ -279,6 +278,9 @@ private:
// Used by general core file debugging. Public access requested in QTCREATORBUG-17158. // Used by general core file debugging. Public access requested in QTCREATORBUG-17158.
Utils::FilePath m_coreFile; Utils::FilePath m_coreFile;
bool m_isSnapshot = false; // Set if created internally. bool m_isSnapshot = false; // Set if created internally.
// Macro-expanded and passed to debugger startup.
QString m_additionalStartupCommands;
}; };
namespace Internal { namespace Internal {