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

Debugger: Fix running on RemoteLinux

Browse Source 
This (temporarily) works around the start up regression due
to wrong order of merged patches.

Change-Id: I7a386fb06175363aa23862716687764b930c52d8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-04-21 08:53:10 +02:00
parent 86ea365a0b
commit dfb825e2a7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -525,6 +525,8 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, const DebuggerRunParame
}
}
qobject_cast<DebuggerRunControl *>(runControl)->m_engine = m_engine;
connect(runControl, &RunControl::finished,
this, &DebuggerRunTool::handleFinished);
connect(m_engine, &DebuggerEngine::requestRemoteSetup,
@@ -583,7 +585,8 @@ void DebuggerRunTool::showMessage(const QString &msg, int channel, int timeout)
DebuggerEngine *engine(const DebuggerRunControl *runControl)
{
QTC_ASSERT(runControl, return nullptr);
return qobject_cast<DebuggerRunTool *>(runControl->toolRunner())->engine();
//return qobject_cast<DebuggerRunTool *>(runControl->toolRunner())->engine();
return runControl->m_engine;
}