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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h

Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac
This commit is contained in:
Eike Ziller
2018-05-28 16:10:23 +02:00
parent 005b0c1147 c1c57f0c38
commit c8c6b28e22
206 changed files with 2634 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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;
@@ -4832,7 +4831,7 @@ static QString findExecutableFromName(const QString &fileNameFromCore, const QSt
return QString();
}
CoreInfo CoreInfo::readExecutableNameFromCore(const StandardRunnable &debugger, const QString &coreFile)
CoreInfo CoreInfo::readExecutableNameFromCore(const Runnable &debugger, const QString &coreFile)
{
CoreInfo cinfo;
#if 0