diff options
| author | Tobias Nätterlund <tobias.naetterlund.qnx@kdab.com> | 2013-10-31 14:25:38 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@digia.com> | 2013-11-04 10:21:57 +0100 |
| commit | 0e2ed3f27cd51087168e1675372635c80e04ec2e (patch) | |
| tree | 7ba53f0c5a699ad953295aa743c171a40c01ee05 /src/plugins/debugger | |
| parent | 0c02cef4328ec3a7655f240967ef5fdd8e2c7660 (diff) | |
| download | qt-creator-0e2ed3f27cd51087168e1675372635c80e04ec2e.tar.gz | |
QNX: Fix interrupting when debugging on Windows
This fixes interrupting the inferior process when debugging
BlackBerry applications on Windows. The code was already in use
for pure QNX application, but never BlackBerry.
Change-Id: Icbf8f913475f523ca178250087bfdf3b89086605
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/debugger')
| -rw-r--r-- | src/plugins/debugger/debuggerstartparameters.h | 4 | ||||
| -rw-r--r-- | src/plugins/debugger/gdb/remotegdbserveradapter.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index 88f5a72e91..2775af5338 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -73,7 +73,8 @@ public: closeMode(KillAtClose), testReceiver(0), testCallback(0), - testCase(0) + testCase(0), + useCtrlCStub(false) {} //Core::Id profileId; @@ -136,6 +137,7 @@ public: // For QNX debugging QString remoteExecutable; + bool useCtrlCStub; // For Debugger testing. QObject *testReceiver; diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index dfe6587112..d15e5d0568 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -63,7 +63,7 @@ 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 + m_gdbProc->setUseCtrlCStub(startParameters.useCtrlCStub); // This is only set for QNX/BlackBerry #endif connect(&m_uploadProc, SIGNAL(error(QProcess::ProcessError)), SLOT(uploadProcError(QProcess::ProcessError))); |