diff --git a/src/plugins/debugger/dap/lldbdapengine.cpp b/src/plugins/debugger/dap/lldbdapengine.cpp index 5a88ad8c836..af2d1868fad 100644 --- a/src/plugins/debugger/dap/lldbdapengine.cpp +++ b/src/plugins/debugger/dap/lldbdapengine.cpp @@ -131,7 +131,7 @@ QJsonArray LldbDapEngine::sourceMap() const QJsonArray LldbDapEngine::preRunCommands() const { const QStringList lines = settings().gdbStartupCommands().split('\n') - + runParameters().additionalStartupCommands.split('\n'); + + runParameters().additionalStartupCommands().split('\n'); QJsonArray result; for (const QString &line : lines) { const QString trimmed = line.trimmed(); diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index aafd4c6e36e..8a870604435 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -151,7 +151,7 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run params.m_isQmlDebugging = aspect->useQmlDebugger; params.isPythonDebugging = aspect->usePythonDebugger; params.multiProcess = aspect->useMultiProcess; - params.additionalStartupCommands = aspect->overrideStartup; + params.m_additionalStartupCommands = aspect->overrideStartup; if (aspect->useCppDebugger) { if (DebuggerKitAspect::debugger(kit)) { @@ -2144,7 +2144,7 @@ QString DebuggerEngine::expand(const QString &string) const QString DebuggerEngine::nativeStartupCommands() const { QStringList lines = settings().gdbStartupCommands().split('\n'); - lines += runParameters().additionalStartupCommands.split('\n'); + lines += runParameters().additionalStartupCommands().split('\n'); lines = Utils::filtered(lines, [](const QString line) { const QString trimmed = line.trimmed(); diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 5e1e44e0bbc..771d2acdd1c 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -176,8 +176,7 @@ public: void setSnapshot(bool isSnapshot) { m_isSnapshot = isSnapshot; } bool isSnapshot() const { return m_isSnapshot; } - // Macro-expanded and passed to debugger startup. - QString additionalStartupCommands; + QString additionalStartupCommands() const { return m_additionalStartupCommands; } DebuggerEngineType cppEngineType = NoEngineType; QString version; @@ -279,6 +278,9 @@ private: // Used by general core file debugging. Public access requested in QTCREATORBUG-17158. Utils::FilePath m_coreFile; bool m_isSnapshot = false; // Set if created internally. + + // Macro-expanded and passed to debugger startup. + QString m_additionalStartupCommands; }; namespace Internal {