Android: Remove traces of special debugger setup

Change-Id: Ibf85a6e6e7c025287dd388bc5908cefc30fbaa2f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

src/plugins/android/androiddebugsupport.cpp

@@ -143,10 +143,6 @@ void AndroidDebugSupport::start()
             addSearchDirectory(qtVersion->qmlPath().toString());
     }
 
-    // FIXME: Move signal to base class and generalize handling.
-    connect(this, &DebuggerRunTool::aboutToNotifyInferiorSetupOk,
-            m_runner, &AndroidRunner::remoteDebuggerRunning);
-
     DebuggerRunTool::start();
 }
 

src/plugins/android/androidrunner.cpp

@@ -155,8 +155,6 @@ AndroidRunner::AndroidRunner(RunControl *runControl,
     connect(this, &AndroidRunner::asyncStop, m_worker.data(), &AndroidRunnerWorkerBase::asyncStop);
     connect(this, &AndroidRunner::androidRunnableChanged,
             m_worker.data(), &AndroidRunnerWorkerBase::setAndroidRunnable);
-    connect(this, &AndroidRunner::remoteDebuggerRunning,
-            m_worker.data(), &AndroidRunnerWorkerBase::handleRemoteDebuggerRunning);
 
     connect(m_worker.data(), &AndroidRunnerWorkerBase::remoteProcessStarted,
             this, &AndroidRunner::handleRemoteProcessStarted);

src/plugins/android/androidrunner.h

@@ -69,7 +69,6 @@ public:
 signals:
     void asyncStart();
     void asyncStop();
-    void remoteDebuggerRunning();
     void qmlServerReady(const QUrl &serverUrl);
     void androidRunnableChanged(const AndroidRunnable &runnable);
     void avdDetected();

src/plugins/android/androidrunnerworker.cpp

@@ -440,9 +440,6 @@ void AndroidRunnerWorkerBase::asyncStop()
     m_gdbServerProcess.reset();
 }
 
-void AndroidRunnerWorkerBase::handleRemoteDebuggerRunning()
-{}
-
 void AndroidRunnerWorkerBase::handleJdbWaiting()
 {
     QStringList removeForward{"forward", "--remove", "tcp:" + m_localJdbServerPort.toString()};

src/plugins/android/androidrunnerworker.h

@@ -71,7 +71,6 @@ public:
 
     virtual void asyncStart();
     virtual void asyncStop();
-    virtual void handleRemoteDebuggerRunning();
     virtual void handleJdbWaiting();
     virtual void handleJdbSettled();
 

src/plugins/debugger/debuggerengine.cpp

@@ -650,12 +650,9 @@ void DebuggerEngine::notifyEngineSetupOk()
     d->m_progress.setProgressValue(250);
     QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state());
     setState(EngineSetupOk);
-    if (isMasterEngine() && runTool()) {
-        runTool()->aboutToNotifyInferiorSetupOk(); // FIXME: Remove, only used for Android.
-        runTool()->reportStarted();
-    }
-
     if (isMasterEngine()) {
+        if (runTool())
+            runTool()->reportStarted();
         // Slaves will get called setupSlaveInferior() below.
         setState(EngineRunRequested);
         showMessage("CALL: RUN ENGINE");

src/plugins/debugger/debuggerruncontrol.h

@@ -136,9 +136,6 @@ public:
 
     Internal::TerminalRunner *terminalRunner() const;
 
-signals:
-    void aboutToNotifyInferiorSetupOk();
-
 private:
     bool fixupParameters();