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 <[email protected]>
qtdevs · Apr 21, 2017 · dfb825e · dfb825e
1 parent 86ea365
commit dfb825e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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 @@ class DEBUGGER_EXPORT DebuggerRunControl : public ProjectExplorer::RunControl
     void requestRemoteSetup();
     void aboutToNotifyInferiorSetupOk();
     void stateChanged(Debugger::DebuggerState state);
+
+public:
+    Internal::DebuggerEngine *m_engine = nullptr; // FIXME: Remove.
 };
 
 } // namespace Debugger