diff options
| author | Oswald Buddenhagen <[email protected]> | 2010-10-19 11:14:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2010-11-17 13:19:07 +0100 |
| commit | 1e362b0f8b0dfd712337df35cd26c5dc98dfc294 (patch) | |
| tree | dbb61c65fc1c3e84b507e03c2b3f62a36acd6488 /src/plugins/debugger/debuggerrunner.cpp | |
| parent | 531c70f05bfc8355f856f2af41be533fb13b85e6 (diff) | |
overhaul process argument handling
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.
Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
Diffstat (limited to 'src/plugins/debugger/debuggerrunner.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerrunner.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 5362ecc261d..2c1a6240aea 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -171,7 +171,7 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu QTC_ASSERT(rc, return sp); sp.startMode = StartInternal; - sp.environment = rc->environment().toStringList(); + sp.environment = rc->environment(); sp.workingDirectory = rc->workingDirectory(); sp.executable = rc->executable(); sp.processArgs = rc->commandLineArguments(); @@ -429,7 +429,7 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams } // Fixme: 1 of 3 testing hacks. - if (sp.processArgs.size() >= 5 && sp.processArgs.at(0) == _("@tcf@")) + if (sp.processArgs.startsWith(__("@tcf@ "))) engineType = GdbEngineType; if (sp.processArgs.contains( _("@lldb@"))) @@ -525,7 +525,7 @@ QString DebuggerRunControl::displayName() const void DebuggerRunControl::setCustomEnvironment(Utils::Environment env) { - d->m_engine->startParameters().environment = env.toStringList(); + d->m_engine->startParameters().environment = env; } bool DebuggerRunControl::checkDebugConfiguration(int toolChain, |