From f63b4a68a41d1d973ef00a42bad61f6faf1773e4 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 22 Jun 2009 12:59:27 +0200
Subject: [PATCH] Move toolchain detecting code to its proper place.
---
src/plugins/debugger/debuggerrunner.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 3521d50f334..c9f4a27fa39 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -82,14 +82,6 @@ RunControl* DebuggerRunner::run(RunConfigurationPtr runConfiguration,
ApplicationRunConfigurationPtr rc =
runConfiguration.dynamicCast<ApplicationRunConfiguration>();
Q_ASSERT(!rc.isNull());
- switch (sp->toolChainType) {
- case ProjectExplorer::ToolChain::UNKNOWN:
- case ProjectExplorer::ToolChain::INVALID:
- sp->toolChainType = rc->toolChainType();
- break;
- default:
- break;
- }
//qDebug() << "***** Debugging" << rc->name() << rc->executable();
DebuggerRunControl *runControl = new DebuggerRunControl(m_manager, startMode, sp, rc);
return runControl;
@@ -157,6 +149,14 @@ void DebuggerRunControl::start()
m_startParameters->workingDir = rc->workingDirectory();
if (m_mode != StartExternal)
m_startParameters->processArgs = rc->commandLineArguments();
+ switch (m_startParameters->toolChainType) {
+ case ProjectExplorer::ToolChain::UNKNOWN:
+ case ProjectExplorer::ToolChain::INVALID:
+ m_startParameters->toolChainType = rc->toolChainType();
+ break;
+ default:
+ break;
+ }
m_manager->setQtDumperLibraryName(rc->dumperLibrary());
if (const ProjectExplorer::Project *project = rc->project()) {
m_startParameters->buildDir = project->buildDirectory(project->activeBuildConfiguration());
--
GitLab