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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ic1ab71d0d40fa6c90e337c8ee9d9558e8f103eaa
This commit is contained in:
Eike Ziller
2017-12-12 10:53:51 +01:00
parent aa7995bae1 32377a9ac5
commit 469edcdde3
29 changed files with 1616 additions and 2293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -756,7 +756,11 @@ void GdbEngine::interruptInferior()
showMessage("TRYING TO INTERRUPT INFERIOR");
if (HostOsInfo::isWindowsHost() && !m_isQnxGdb) {
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state(); notifyInferiorStopFailed());
DeviceProcessSignalOperation::Ptr signalOperation = runTool()->device()->signalOperation();
IDevice::ConstPtr device = runTool()->device();
if (!device)
device = runParameters().inferior.device;
QTC_ASSERT(device, notifyInferiorStopFailed(); return);
DeviceProcessSignalOperation::Ptr signalOperation = device->signalOperation();
QTC_ASSERT(signalOperation, notifyInferiorStopFailed(); return);
connect(signalOperation.data(), &DeviceProcessSignalOperation::finished,
this, [this, signalOperation](const QString &error) {