diff options
| author | hjk <hjk@qt.io> | 2017-05-05 14:45:36 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2017-05-18 07:05:09 +0000 |
| commit | 1f6764a54e4d508826f72a090bcb68fcd16a568d (patch) | |
| tree | 8126682b1925e08f8b607e2bbf29f56de4aef1a2 /src/plugins/debugger/gdb/remotegdbserveradapter.cpp | |
| parent | c9cd6b1223d3225c2ae168cab91c51f3e61bf20e (diff) | |
Debugger: Move run parameters from engine to tool runner
The parameters belong to the run control, they should not
be triplicated in case of a combined engine.
Change-Id: I4dd84220edbd7a44b902cc52627fe01d0568db75
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/debugger/gdb/remotegdbserveradapter.cpp')
| -rw-r--r-- | src/plugins/debugger/gdb/remotegdbserveradapter.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index 4b18434308..4f50860134 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -54,12 +54,9 @@ namespace Internal { // /////////////////////////////////////////////////////////////////////// -GdbRemoteServerEngine::GdbRemoteServerEngine(const DebuggerRunParameters &runParameters) - : GdbEngine(runParameters), m_startAttempted(false) +GdbRemoteServerEngine::GdbRemoteServerEngine(bool useTerminal) + : GdbEngine(useTerminal) { - if (HostOsInfo::isWindowsHost()) - m_gdbProc.setUseCtrlCStub(runParameters.useCtrlCStub); // This is only set for QNX - connect(&m_uploadProc, &QProcess::errorOccurred, this, &GdbRemoteServerEngine::uploadProcError); connect(&m_uploadProc, &QProcess::readyReadStandardOutput, this, &GdbRemoteServerEngine::readUploadStandardOutput); @@ -71,6 +68,9 @@ GdbRemoteServerEngine::GdbRemoteServerEngine(const DebuggerRunParameters &runPar void GdbRemoteServerEngine::setupEngine() { + if (HostOsInfo::isWindowsHost()) + m_gdbProc.setUseCtrlCStub(runParameters().useCtrlCStub); // This is only set for QNX + QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); showMessage("TRYING TO START ADAPTER"); QString serverStartScript = runParameters().serverStartScript; @@ -170,8 +170,7 @@ void GdbRemoteServerEngine::setupInferior() //const QByteArray sysroot = sp.sysroot.toLocal8Bit(); //const QByteArray remoteArch = sp.remoteArchitecture.toLatin1(); - const QString args = isMasterEngine() ? runParameters().inferior.commandLineArguments - : masterEngine()->runParameters().inferior.commandLineArguments; + const QString args = runParameters().inferior.commandLineArguments; // if (!remoteArch.isEmpty()) // postCommand("set architecture " + remoteArch); |