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

Merge remote-tracking branch 'origin/4.6' into 4.7

Browse Source 
Change-Id: Ifddceb06f377ea428300fa8a48908cfc44b98705
This commit is contained in:
Eike Ziller
2018-05-28 16:07:00 +02:00
parent bae61e08ea d8caa228ea
commit c1c57f0c38
9 changed files with 85 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -696,7 +696,6 @@ void GdbEngine::interruptInferior()
showStatusMessage(tr("Stop requested..."), 5000);
showMessage("TRYING TO INTERRUPT INFERIOR");
if (HostOsInfo::isWindowsHost() && !m_isQnxGdb) {
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state(); notifyInferiorStopFailed());
IDevice::ConstPtr device = runTool()->device();
if (!device)
device = runParameters().inferior.device;