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

debugger: fix recent regression in startup behaviour

Browse Source
This commit is contained in:
hjk
2009-09-17 14:20:57 +02:00
parent e642b0b1b6
commit 6439d545dc
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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: