aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-04-01 11:17:12 +0200
committerhjk <hjk@qt.io>2020-04-02 06:24:42 +0000
commitd746b4ab2d942a62b1be083a56907c85f4ab169e (patch)
treebff507f2052ec31bf4d1ba41126d6ffcb6bae2fc
parent0ae676d84ab8a74e1e97665ba183833bdc12c7f6 (diff)
Debugger: Rename some gdbserver variable to debugServer
It could be lldb-server at some time, too. Change-Id: Iba4bd0d073ba74e10dd579f0115570ccd4189da3 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
-rw-r--r--src/plugins/debugger/debuggerruncontrol.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index c6cf2ec248..ca3d7727a2 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -1078,9 +1078,9 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
setStarter([this, runControl, mainRunnable, portsGatherer] {
QTC_ASSERT(portsGatherer, reportFailure(); return);
- Runnable gdbserver;
- gdbserver.environment = mainRunnable.environment;
- gdbserver.workingDirectory = mainRunnable.workingDirectory;
+ Runnable debugServer;
+ debugServer.environment = mainRunnable.environment;
+ debugServer.workingDirectory = mainRunnable.workingDirectory;
QStringList args = QtcProcess::splitArgs(mainRunnable.commandLineArguments, OsTypeLinux);
@@ -1092,11 +1092,11 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
portsGatherer->qmlServer()));
}
if (isQmlDebugging && !isCppDebugging) {
- gdbserver.executable = mainRunnable.executable; // FIXME: Case should not happen?
+ debugServer.executable = mainRunnable.executable; // FIXME: Case should not happen?
} else {
- gdbserver.executable = FilePath::fromString(runControl->device()->debugServerPath());
- if (gdbserver.executable.isEmpty())
- gdbserver.executable = FilePath::fromString("gdbserver");
+ debugServer.executable = FilePath::fromString(runControl->device()->debugServerPath());
+ if (debugServer.executable.isEmpty())
+ debugServer.executable = FilePath::fromString("gdbserver");
args.clear();
if (m_useMulti)
args.append("--multi");
@@ -1106,9 +1106,9 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
if (m_pid.isValid())
args.append(QString::number(m_pid.pid()));
}
- gdbserver.commandLineArguments = QtcProcess::joinArgs(args, OsTypeLinux);
+ debugServer.commandLineArguments = QtcProcess::joinArgs(args, OsTypeLinux);
- doStart(gdbserver, runControl->device());
+ doStart(debugServer, runControl->device());
});
}