forked from qt-creator/qt-creator
Qnx: Fix debugging
This apparently fell through the cracks in 89f02cba2
.
Task-number: QTCREATORBUG-18804
Change-Id: Ib00a5a074ec1df3292267a194e8e87a92d3c6dfc
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user