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

Qnx: Fix debugging

Browse Source 
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:
hjk
2017-09-06 17:11:42 +02:00
parent 5680c1c874
commit 015f0c03cf
3 changed files with 8 additions and 11 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)); arguments.append(Utils::QtcProcess::splitArgs(r.commandLineArguments));
r.commandLineArguments = Utils::QtcProcess::joinArgs(arguments); r.commandLineArguments = Utils::QtcProcess::joinArgs(arguments);
setRunnable(r);
SimpleTargetRunner::start(); SimpleTargetRunner::start();
} }
@@ -102,9 +104,9 @@ QnxDebugSupport::QnxDebugSupport(RunControl *runControl)
debuggeeRunner->addStartDependency(m_portsGatherer); debuggeeRunner->addStartDependency(m_portsGatherer);
auto slog2InfoRunner = new Slog2InfoRunner(runControl); auto slog2InfoRunner = new Slog2InfoRunner(runControl);
slog2InfoRunner->addStartDependency(debuggeeRunner); debuggeeRunner->addStartDependency(slog2InfoRunner);
addStartDependency(slog2InfoRunner); addStartDependency(debuggeeRunner);
} }
void QnxDebugSupport::start() void QnxDebugSupport::start()
@@ -135,15 +137,9 @@ void QnxDebugSupport::start()
if (qtVersion) if (qtVersion)
params.solibSearchPath = QnxUtils::searchPaths(qtVersion); params.solibSearchPath = QnxUtils::searchPaths(qtVersion);
reportStarted(); setStartParameters(params);
}
void QnxDebugSupport::stop() DebuggerRunTool::start();
{
// 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);
} }
} // namespace Internal } // namespace Internal

1
src/plugins/qnx/qnxdebugsupport.h
View File

@@ -39,7 +39,6 @@ public:
private: private:
void start() override; void start() override;
void stop() override;
Debugger::GdbServerPortsGatherer *m_portsGatherer; Debugger::GdbServerPortsGatherer *m_portsGatherer;
}; };

2
src/plugins/qnx/slog2inforunner.cpp
View File

@@ -76,6 +76,7 @@ void Slog2InfoRunner::start()
StandardRunnable r; StandardRunnable r;
r.executable = QLatin1String("slog2info"); r.executable = QLatin1String("slog2info");
m_testProcess->start(r); m_testProcess->start(r);
reportStarted();
} }
void Slog2InfoRunner::stop() void Slog2InfoRunner::stop()
@@ -87,6 +88,7 @@ void Slog2InfoRunner::stop()
m_logProcess->kill(); m_logProcess->kill();
processLog(true); processLog(true);
} }
reportStopped();
} }
bool Slog2InfoRunner::commandFound() const bool Slog2InfoRunner::commandFound() const