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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Change-Id: I53a31b3463b2bd8efffb1c00e5d172854d8ff5e5
This commit is contained in:
Eike Ziller
2017-09-08 13:06:07 +02:00
parent 79e94ddae8 315cede70f
commit a9aac73e37
17 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qnx/qnxdebugsupport.cpp
View File

@@ -79,6 +79,8 @@ private:
arguments.append(Utils::QtcProcess::splitArgs(r.commandLineArguments));
r.commandLineArguments = Utils::QtcProcess::joinArgs(arguments);
setRunnable(r);
SimpleTargetRunner::start();
}
@@ -102,9 +104,9 @@ QnxDebugSupport::QnxDebugSupport(RunControl *runControl)
debuggeeRunner->addStartDependency(m_portsGatherer);
auto slog2InfoRunner = new Slog2InfoRunner(runControl);
slog2InfoRunner->addStartDependency(debuggeeRunner);
debuggeeRunner->addStartDependency(slog2InfoRunner);
addStartDependency(slog2InfoRunner);
addStartDependency(debuggeeRunner);
}
void QnxDebugSupport::start()
@@ -136,15 +138,9 @@ void QnxDebugSupport::start()
if (qtVersion)
params.solibSearchPath = QnxUtils::searchPaths(qtVersion);
reportStarted();
}
setStartParameters(params);
void QnxDebugSupport::stop()
{
// We have to kill the inferior process, as invoking "kill" in
// gdb doesn't work on QNX gdb.
auto stdRunnable = runnable().as<StandardRunnable>();
device()->signalOperation()->killProcess(stdRunnable.executable);
DebuggerRunTool::start();
}
} // namespace Internal