diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-15 10:21:47 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-15 10:21:47 +0200 |
| commit | 6fb94a7b10216cb03544acfca1ea5e7e121dd50e (patch) | |
| tree | 2e5aba50125b1bda1ccb1739b5a6c39336e6333a /src/plugins/debugger/gdb/remotegdbserveradapter.cpp | |
| parent | c6bee7e20eff2cefe3300d2d5a9fc23508402e98 (diff) | |
| parent | 8ca5b55a0bafd744cf62c20de379a7738cb76138 (diff) | |
| download | qt-creator-6fb94a7b10216cb03544acfca1ea5e7e121dd50e.tar.gz | |
Merge branch '2.7'
Conflicts:
doc/src/qtquick/qtquick-components.qdoc
doc/src/qtquick/qtquick-designer.qdoc
qtcreator.pri
qtcreator.qbs
src/plugins/cppeditor/cppinsertdecldef.cpp
src/plugins/qnx/qnxruncontrolfactory.cpp
Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
Diffstat (limited to 'src/plugins/debugger/gdb/remotegdbserveradapter.cpp')
| -rw-r--r-- | src/plugins/debugger/gdb/remotegdbserveradapter.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index 9beadfe351..1761e5a898 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -60,6 +60,9 @@ GdbRemoteServerEngine::GdbRemoteServerEngine(const DebuggerStartParameters &star { m_isMulti = false; m_targetPid = -1; +#ifdef Q_OS_WIN + m_gdbProc.setUseCtrlCStub(!startParameters.remoteExecutable.isEmpty()); // This is only set for QNX +#endif connect(&m_uploadProc, SIGNAL(error(QProcess::ProcessError)), SLOT(uploadProcError(QProcess::ProcessError))); connect(&m_uploadProc, SIGNAL(readyReadStandardOutput()), @@ -430,6 +433,10 @@ void GdbRemoteServerEngine::interruptInferior2() if (debuggerCore()->boolSetting(TargetAsync)) { postCommand("-exec-interrupt", GdbEngine::Immediate, CB(handleInterruptInferior)); +#ifdef Q_OS_WIN + } else if (m_isQnxGdb) { + m_gdbProc.winInterruptByCtrlC(); +#endif } else { bool ok = m_gdbProc.interrupt(); if (!ok) { |