diff options
| author | hjk <hjk@qt.io> | 2017-04-21 08:53:10 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2017-04-21 08:08:37 +0000 |
| commit | dfb825e2a76981ef3dd114b8ece7e255f43d40a6 (patch) | |
| tree | 63e2c604c6794d0b7fa78043b32e7e3cc9db545e | |
| parent | 86ea365a0b2161e154cd3cb33b8d214db2e65e91 (diff) | |
| download | qt-creator-dfb825e2a76981ef3dd114b8ece7e255f43d40a6.tar.gz | |
Debugger: Fix running on RemoteLinux
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>
| -rw-r--r-- | src/plugins/debugger/debuggerruncontrol.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/debugger/debuggerruncontrol.h | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index a9341a6148..2ea00d6249 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -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; } diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h index 5fa6313b7b..4991533c9e 100644 --- a/src/plugins/debugger/debuggerruncontrol.h +++ b/src/plugins/debugger/debuggerruncontrol.h @@ -36,6 +36,8 @@ class RemoteSetupResult; class DebuggerStartParameters; class DebuggerRunControl; +namespace Internal { class DebuggerEngine; } + DEBUGGER_EXPORT DebuggerRunControl *createDebuggerRunControl(const DebuggerStartParameters &sp, ProjectExplorer::RunConfiguration *runConfig, QString *errorMessage, @@ -70,6 +72,9 @@ signals: void requestRemoteSetup(); void aboutToNotifyInferiorSetupOk(); void stateChanged(Debugger::DebuggerState state); + +public: + Internal::DebuggerEngine *m_engine = nullptr; // FIXME: Remove. }; } // namespace Debugger |