From 18e1c366488979fa4c892ebaf5600e14407aadd7 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@qt.io>
Date: Thu, 7 Mar 2024 16:53:20 +0100
Subject: [PATCH] boot2qt: Fix reading the perf record args

Change-Id: I0b181dc05a409a38cbd87366a0cb6631c900ed24
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/boot2qt/qdbdevicedebugsupport.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
index 15373e4b4cf..b3129adf22e 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
@@ -5,6 +5,8 @@
 
 #include "qdbconstants.h"
 
+#include <perfprofiler/perfprofilerconstants.h>
+
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runcontrol.h>
@@ -88,13 +90,10 @@ public:
             upperPort = qmlServerPort;
         }
         if (m_usePerf) {
-            Store settingsData = runControl()->settingsData("Analyzer.Perf.Settings");
-            QVariant perfRecordArgs = settingsData.value("Analyzer.Perf.RecordArguments");
-            QString args =  Utils::transform(perfRecordArgs.toStringList(), [](QString arg) {
-                                    return arg.replace(',', ",,");
-                            }).join(',');
+            const Store perfArgs = runControl()->settingsData(PerfProfiler::Constants::PerfSettingsId);
+            const QString recordArgs = perfArgs[PerfProfiler::Constants::PerfRecordArgsId].toString();
             cmd.addArg("--profile-perf");
-            cmd.addArg(args);
+            cmd.addArgs(recordArgs, CommandLine::Raw);
             lowerPort = upperPort = perfPort;
         }
         cmd.addArg("--port-range");