From 063fd3dcf8d46b5ecc0a0b1657f49a0f35ef825f Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 19 Nov 2024 15:33:30 +0100
Subject: [PATCH] Android: Remove serverUrl arg from qmlServerReady() signal

Amends e66ae4ac76c6caf995a29d9b98fe7323dec648a4

Change-Id: Ia670acc4d1aaccb2fb44712e973e6a4d7d2b6508
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/qmldebug/qmloutputparser.h   |  2 +-
 src/plugins/android/androidrunner.cpp | 15 +--------------
 src/plugins/android/androidrunner.h   |  4 +---
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/libs/qmldebug/qmloutputparser.h b/src/libs/qmldebug/qmloutputparser.h
index d875ea59183..486dc9002fc 100644
--- a/src/libs/qmldebug/qmloutputparser.h
+++ b/src/libs/qmldebug/qmloutputparser.h
@@ -20,7 +20,7 @@ public:
     void processOutput(const QString &output);
 
 signals:
-    void waitingForConnectionOnPort(Utils::Port port);
+    void waitingForConnectionOnPort(Utils::Port port); // TODO: Unused port arg.
     void connectionEstablishedMessage();
     void connectingToSocketMessage();
     void errorMessage(const QString &detailedError);
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 6b8150ec037..f8395f30c07 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -45,7 +45,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl)
     Q_UNUSED(metaTypes)
 
     connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort,
-            this, &AndroidRunner::qmlServerPortReady);
+            this, &AndroidRunner::qmlServerReady);
 }
 
 void AndroidRunner::start()
@@ -116,19 +116,6 @@ void AndroidRunner::stop()
     emit canceled();
 }
 
-void AndroidRunner::qmlServerPortReady(Port port)
-{
-    // FIXME: Note that the passed is nonsense, as the port is on the
-    // device side. It only happens to work since we redirect
-    // host port n to target port n via adb.
-    QUrl serverUrl;
-    serverUrl.setHost(QHostAddress(QHostAddress::LocalHost).toString());
-    serverUrl.setPort(port.number());
-    serverUrl.setScheme(urlTcpScheme());
-    qCDebug(androidRunnerLog) << "Qml Server port ready"<< serverUrl;
-    emit qmlServerReady(serverUrl);
-}
-
 void AndroidRunner::remoteStarted(const Port &debugServerPort, qint64 pid)
 {
     m_pid = ProcessHandle(pid);
diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h
index bf77bc32848..c4833f44559 100644
--- a/src/plugins/android/androidrunner.h
+++ b/src/plugins/android/androidrunner.h
@@ -26,12 +26,10 @@ public:
 
 signals:
     void canceled();
-    void qmlServerReady(const QUrl &serverUrl);
+    void qmlServerReady();
     void avdDetected();
 
 private:
-    void qmlServerPortReady(Utils::Port port);
-
     void remoteStarted(const Utils::Port &debugServerPort, qint64 pid);
     void remoteFinished(const QString &errString);
     void remoteStdOut(const QString &output);