Commit 015f0c03 authored by hjk's avatar hjk

Qnx: Fix debugging

This apparently fell through the cracks in 89f02cba.

Task-number: QTCREATORBUG-18804
Change-Id: Ib00a5a074ec1df3292267a194e8e87a92d3c6dfc
Reviewed-by: default avatarDan Cape <dcape@qnx.com>
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 5680c1c8
......@@ -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()
......@@ -135,15 +137,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
......
......@@ -39,7 +39,6 @@ public:
private:
void start() override;
void stop() override;
Debugger::GdbServerPortsGatherer *m_portsGatherer;
};
......
......@@ -76,6 +76,7 @@ void Slog2InfoRunner::start()
StandardRunnable r;
r.executable = QLatin1String("slog2info");
m_testProcess->start(r);
reportStarted();
}
void Slog2InfoRunner::stop()
......@@ -87,6 +88,7 @@ void Slog2InfoRunner::stop()
m_logProcess->kill();
processLog(true);
}
reportStopped();
}
bool Slog2InfoRunner::commandFound() const
......
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