diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-10 13:11:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-10 13:20:02 +0100 |
| commit | 541d00453ab134874a2a2f95079703f1f57ebd89 (patch) | |
| tree | fd2d375681c6fb266a740971442964e8a141ac3e /src/plugins/debugger/gdb/remotegdbserveradapter.cpp | |
| parent | 62b70fb2398ca16c471ce65be2bfb996a030302b (diff) | |
| parent | f8a68cc69a9c8cf0c0ddd15e9dae4bd84ae8b0bd (diff) | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/projectexplorer/projectexplorer.cpp
src/shared/qbs
Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
Diffstat (limited to 'src/plugins/debugger/gdb/remotegdbserveradapter.cpp')
| -rw-r--r-- | src/plugins/debugger/gdb/remotegdbserveradapter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index 63cacf3a7d..4232c13f79 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -60,7 +60,7 @@ namespace Internal { /////////////////////////////////////////////////////////////////////// GdbRemoteServerEngine::GdbRemoteServerEngine(const DebuggerStartParameters &startParameters) - : GdbEngine(startParameters) + : GdbEngine(startParameters), m_startAttempted(false) { if (Utils::HostOsInfo::isWindowsHost()) m_gdbProc->setUseCtrlCStub(startParameters.useCtrlCStub); // This is only set for QNX/BlackBerry @@ -484,7 +484,7 @@ void GdbRemoteServerEngine::notifyEngineRemoteServerRunning void GdbRemoteServerEngine::notifyEngineRemoteSetupFinished(const RemoteSetupResult &result) { QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); - DebuggerEngine::notifyEngineRemoteSetupFinished(result); + GdbEngine::notifyEngineRemoteSetupFinished(result); if (result.success) { if (!m_startAttempted) |