Android: Remove serverUrl arg from qmlServerReady() signal

Amends e66ae4ac76

Change-Id: Ia670acc4d1aaccb2fb44712e973e6a4d7d2b6508
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-11-19 15:33:30 +01:00
parent de5485aba9
commit 063fd3dcf8
3 changed files with 3 additions and 18 deletions

View File

@@ -20,7 +20,7 @@ public:
void processOutput(const QString &output); void processOutput(const QString &output);
signals: signals:
void waitingForConnectionOnPort(Utils::Port port); void waitingForConnectionOnPort(Utils::Port port); // TODO: Unused port arg.
void connectionEstablishedMessage(); void connectionEstablishedMessage();
void connectingToSocketMessage(); void connectingToSocketMessage();
void errorMessage(const QString &detailedError); void errorMessage(const QString &detailedError);

View File

@@ -45,7 +45,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl)
Q_UNUSED(metaTypes) Q_UNUSED(metaTypes)
connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort, connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort,
this, &AndroidRunner::qmlServerPortReady); this, &AndroidRunner::qmlServerReady);
} }
void AndroidRunner::start() void AndroidRunner::start()
@@ -116,19 +116,6 @@ void AndroidRunner::stop()
emit canceled(); 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) void AndroidRunner::remoteStarted(const Port &debugServerPort, qint64 pid)
{ {
m_pid = ProcessHandle(pid); m_pid = ProcessHandle(pid);

View File

@@ -26,12 +26,10 @@ public:
signals: signals:
void canceled(); void canceled();
void qmlServerReady(const QUrl &serverUrl); void qmlServerReady();
void avdDetected(); void avdDetected();
private: private:
void qmlServerPortReady(Utils::Port port);
void remoteStarted(const Utils::Port &debugServerPort, qint64 pid); void remoteStarted(const Utils::Port &debugServerPort, qint64 pid);
void remoteFinished(const QString &errString); void remoteFinished(const QString &errString);
void remoteStdOut(const QString &output); void remoteStdOut(const QString &output);