Android: Rename some gdbServer* to debugServer*

There's LLDB coming into play, and debugServer is what we use on
BareMetal and RemoteLinux, too.

Change-Id: I77f8545ebbe6685708215ac579789f7d4990b7be
Task-number: QTCREATORBUG-23260
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h
index ae43200d8d..4b2dc885bd 100644
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -64,7 +64,7 @@ public:
     void handleJdbSettled();
 
 signals:
-    void remoteProcessStarted(Utils::Port gdbServerPort, const QUrl &qmlServer, qint64 pid);
+    void remoteProcessStarted(Utils::Port debugServerPort, const QUrl &qmlServer, qint64 pid);
     void remoteProcessFinished(const QString &errString = QString());
 
     void remoteOutput(const QString &output);
@@ -73,10 +73,10 @@ signals:
 private:
     void asyncStartHelper();
     bool startDebuggerServer(const QString &packageDir, const QString &gdbServerPrefix,
-                             const QString &gdbServerExecutable, QString *errorStr = nullptr);
+                             const QString &debugServerExecutable, QString *errorStr = nullptr);
     bool deviceFileExists(const QString &filePath);
     bool packageFileExists(const QString& filePath);
-    bool uploadGdbServer();
+    bool uploadDebugServer();
 
     enum class JDBState {
         Idle,
@@ -102,17 +102,17 @@ private:
     QFuture<qint64> m_pidFinder;
     bool m_useCppDebugger = false;
     QmlDebug::QmlDebugServicesPreset m_qmlDebugServices;
-    Utils::Port m_localGdbServerPort; // Local end of forwarded debug socket.
+    Utils::Port m_localDebugServerPort; // Local end of forwarded debug socket.
     QUrl m_qmlServer;
     JDBState m_jdbState = JDBState::Idle;
     Utils::Port m_localJdbServerPort;
-    std::unique_ptr<QProcess, Deleter> m_gdbServerProcess;
+    std::unique_ptr<QProcess, Deleter> m_debugServerProcess; // gdbserver or lldb-server
     std::unique_ptr<QProcess, Deleter> m_jdbProcess;
     QString m_deviceSerialNumber;
     int m_apiLevel = -1;
     QString m_extraAppParams;
     Utils::Environment m_extraEnvVars;
-    QString m_gdbserverPath;
+    QString m_debugServerPath;
     bool m_useAppParamsForQmlDebugger = false;
 };