From 6439d545dc734e7ef2ba53a570ccc46f4a2cc157 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 17 Sep 2009 14:20:57 +0200
Subject: [PATCH] debugger: fix recent regression in startup behaviour
---
src/plugins/debugger/debuggerrunner.cpp | 4 ++--
src/plugins/debugger/debuggerrunner.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 7a6f2ce6299..738e96a17b2 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -125,7 +125,6 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
const QSharedPointer<DebuggerStartParameters> &startParameters,
QSharedPointer<ApplicationRunConfiguration> runConfiguration)
: RunControl(runConfiguration),
- m_mode(mode),
m_startParameters(startParameters),
m_manager(manager),
m_running(false)
@@ -147,13 +146,14 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
// Enhance parameters by info from the project, but do not clobber
// arguments given in the dialogs
+ m_startParameters->startMode = mode;
if (m_startParameters->executable.isEmpty())
m_startParameters->executable = runConfiguration->executable();
if (m_startParameters->environment.empty())
m_startParameters->environment = runConfiguration->environment().toStringList();
if (m_startParameters->workingDir.isEmpty())
m_startParameters->workingDir = runConfiguration->workingDirectory();
- if (m_mode != StartExternal)
+ if (m_startParameters->startMode != StartExternal)
m_startParameters->processArgs = runConfiguration->commandLineArguments();
switch (m_startParameters->toolChainType) {
case ProjectExplorer::ToolChain::UNKNOWN:
diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h
index ec43678e94e..a7e08eea367 100644
--- a/src/plugins/debugger/debuggerrunner.h
+++ b/src/plugins/debugger/debuggerrunner.h
@@ -91,8 +91,6 @@ public:
const DebuggerStartParametersPtr &startParamters,
ApplicationRunConfigurationPtr runConfiguration);
- DebuggerStartMode startMode() const { return m_mode; }
-
// ProjectExplorer::RunControl
virtual void start();
virtual void stop();
@@ -108,7 +106,6 @@ private slots:
void slotAddToOutputWindowInline(const QString &output);
private:
- const DebuggerStartMode m_mode;
DebuggerStartParametersPtr m_startParameters;
DebuggerManager *m_manager;
bool m_running;
--
GitLab