feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Rename some gdbserver variable to debugServer

Browse Source 
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>
This commit is contained in:
hjk
2020-04-01 11:17:12 +02:00
parent 0ae676d84a
commit d746b4ab2d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -1078,9 +1078,9 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
setStarter([this, runControl, mainRunnable, portsGatherer] { setStarter([this, runControl, mainRunnable, portsGatherer] {
QTC_ASSERT(portsGatherer, reportFailure(); return); QTC_ASSERT(portsGatherer, reportFailure(); return);
Runnable gdbserver; Runnable debugServer;
gdbserver.environment = mainRunnable.environment; debugServer.environment = mainRunnable.environment;
gdbserver.workingDirectory = mainRunnable.workingDirectory; debugServer.workingDirectory = mainRunnable.workingDirectory;
QStringList args = QtcProcess::splitArgs(mainRunnable.commandLineArguments, OsTypeLinux); QStringList args = QtcProcess::splitArgs(mainRunnable.commandLineArguments, OsTypeLinux);
@@ -1092,11 +1092,11 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
portsGatherer->qmlServer())); portsGatherer->qmlServer()));
} }
if (isQmlDebugging && !isCppDebugging) { if (isQmlDebugging && !isCppDebugging) {
gdbserver.executable = mainRunnable.executable; // FIXME: Case should not happen? debugServer.executable = mainRunnable.executable; // FIXME: Case should not happen?
} else { } else {
gdbserver.executable = FilePath::fromString(runControl->device()->debugServerPath()); debugServer.executable = FilePath::fromString(runControl->device()->debugServerPath());
if (gdbserver.executable.isEmpty()) if (debugServer.executable.isEmpty())
gdbserver.executable = FilePath::fromString("gdbserver"); debugServer.executable = FilePath::fromString("gdbserver");
args.clear(); args.clear();
if (m_useMulti) if (m_useMulti)
args.append("--multi"); args.append("--multi");
@@ -1106,9 +1106,9 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
if (m_pid.isValid()) if (m_pid.isValid())
args.append(QString::number(m_pid.pid())); 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());
}); });
} }