Commit 6439d545 authored by hjk's avatar hjk
Browse files

debugger: fix recent regression in startup behaviour

parent e642b0b1
...@@ -125,7 +125,6 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager, ...@@ -125,7 +125,6 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
const QSharedPointer<DebuggerStartParameters> &startParameters, const QSharedPointer<DebuggerStartParameters> &startParameters,
QSharedPointer<ApplicationRunConfiguration> runConfiguration) QSharedPointer<ApplicationRunConfiguration> runConfiguration)
: RunControl(runConfiguration), : RunControl(runConfiguration),
m_mode(mode),
m_startParameters(startParameters), m_startParameters(startParameters),
m_manager(manager), m_manager(manager),
m_running(false) m_running(false)
...@@ -147,13 +146,14 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager, ...@@ -147,13 +146,14 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
// Enhance parameters by info from the project, but do not clobber // Enhance parameters by info from the project, but do not clobber
// arguments given in the dialogs // arguments given in the dialogs
m_startParameters->startMode = mode;
if (m_startParameters->executable.isEmpty()) if (m_startParameters->executable.isEmpty())
m_startParameters->executable = runConfiguration->executable(); m_startParameters->executable = runConfiguration->executable();
if (m_startParameters->environment.empty()) if (m_startParameters->environment.empty())
m_startParameters->environment = runConfiguration->environment().toStringList(); m_startParameters->environment = runConfiguration->environment().toStringList();
if (m_startParameters->workingDir.isEmpty()) if (m_startParameters->workingDir.isEmpty())
m_startParameters->workingDir = runConfiguration->workingDirectory(); m_startParameters->workingDir = runConfiguration->workingDirectory();
if (m_mode != StartExternal) if (m_startParameters->startMode != StartExternal)
m_startParameters->processArgs = runConfiguration->commandLineArguments(); m_startParameters->processArgs = runConfiguration->commandLineArguments();
switch (m_startParameters->toolChainType) { switch (m_startParameters->toolChainType) {
case ProjectExplorer::ToolChain::UNKNOWN: case ProjectExplorer::ToolChain::UNKNOWN:
......
...@@ -91,8 +91,6 @@ public: ...@@ -91,8 +91,6 @@ public:
const DebuggerStartParametersPtr &startParamters, const DebuggerStartParametersPtr &startParamters,
ApplicationRunConfigurationPtr runConfiguration); ApplicationRunConfigurationPtr runConfiguration);
DebuggerStartMode startMode() const { return m_mode; }
// ProjectExplorer::RunControl // ProjectExplorer::RunControl
virtual void start(); virtual void start();
virtual void stop(); virtual void stop();
...@@ -108,7 +106,6 @@ private slots: ...@@ -108,7 +106,6 @@ private slots:
void slotAddToOutputWindowInline(const QString &output); void slotAddToOutputWindowInline(const QString &output);
private: private:
const DebuggerStartMode m_mode;
DebuggerStartParametersPtr m_startParameters; DebuggerStartParametersPtr m_startParameters;
DebuggerManager *m_manager; DebuggerManager *m_manager;
bool m_running; bool m_running;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment