From 26ef8707610847b641d5831de0288dd4e9d66cc4 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 23 Jun 2023 13:20:27 +0200 Subject: [PATCH] Debugger: Somewhat more direct server command construction No need to set args just to delete them again. Change-Id: Ib97d327329a25cb907227feb22db2334908ef089 Reviewed-by: Marcus Tillmanns --- src/plugins/debugger/debuggerruncontrol.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index dc090bf30dc..20812bbee34 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -1034,14 +1034,12 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat CommandLine cmd; - if (isQmlDebugging) { + if (isQmlDebugging && !isCppDebugging) { + // FIXME: Case should not happen? + cmd.setExecutable(commandLine().executable()); cmd.addArg(QmlDebug::qmlDebugTcpArguments(QmlDebug::QmlDebuggerServices, portsGatherer->qmlServer())); - } - cmd.addArgs(commandLine().arguments(), CommandLine::Raw); - - if (isQmlDebugging && !isCppDebugging) { - cmd.setExecutable(commandLine().executable()); // FIXME: Case should not happen? + cmd.addArgs(commandLine().arguments(), CommandLine::Raw); } else { cmd.setExecutable(runControl->device()->debugServerPath()); @@ -1065,7 +1063,6 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat cmd.setExecutable(runControl->device()->filePath("gdbserver")); } } - cmd.setArguments({}); if (cmd.executable().baseName().contains("lldb-server")) { cmd.addArg("platform"); cmd.addArg("--listen");