diff --git a/src/plugins/perfprofiler/perfconfigwidget.cpp b/src/plugins/perfprofiler/perfconfigwidget.cpp index eceae43a042..5eefee9c22d 100644 --- a/src/plugins/perfprofiler/perfconfigwidget.cpp +++ b/src/plugins/perfprofiler/perfconfigwidget.cpp @@ -144,12 +144,8 @@ void PerfConfigWidget::setTarget(ProjectExplorer::Target *target) QTC_ASSERT(device, return); QTC_CHECK(!m_process || m_process->state() == QProcess::NotRunning); - m_process.reset(device->createProcess(nullptr)); - if (!m_process) { - useTracePointsButton->setEnabled(false); - return; - } - + m_process.reset(new QtcProcess); + m_process->setCommand({device->mapToGlobalPath("perf"), {"probe", "-l"}}); connect(m_process.get(), &QtcProcess::done, this, &PerfConfigWidget::handleProcessDone); @@ -174,7 +170,6 @@ void PerfConfigWidget::readTracePoints() messageBox.setText(tr("Replace events with trace points read from the device?")); messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); if (messageBox.exec() == QMessageBox::Yes) { - m_process->setCommand({"perf", {"probe", "-l"}}); m_process->start(); useTracePointsButton->setEnabled(false); } diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp index f08345e805c..3d78d1f1723 100644 --- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp +++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp @@ -124,7 +124,7 @@ public: void start() override { - m_process = device()->createProcess(this); + m_process = new QtcProcess(this); if (!m_process) { reportFailure(tr("Could not start device process.")); return; @@ -147,7 +147,7 @@ public: Runnable perfRunnable = runnable(); - CommandLine cmd({"perf", {"record"}}); + CommandLine cmd({device()->mapToGlobalPath("perf"), {"record"}}); cmd.addArgs(m_perfRecordArguments); cmd.addArgs({"-o", "-", "--"}); cmd.addCommandLineAsArgs(perfRunnable.command, CommandLine::Raw); diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp index 3f37a74fe8f..9ee65b601ef 100644 --- a/src/plugins/perfprofiler/perftracepointdialog.cpp +++ b/src/plugins/perfprofiler/perftracepointdialog.cpp @@ -89,15 +89,15 @@ void PerfTracePointDialog::runScript() m_ui->privilegesChooser->setEnabled(false); m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - m_process.reset(m_device->createProcess(this)); + m_process.reset(new QtcProcess(this)); m_process->setWriteData(m_ui->textEdit->toPlainText().toUtf8()); m_ui->textEdit->clear(); const QString elevate = m_ui->privilegesChooser->currentText(); if (elevate != QLatin1String("n.a.")) - m_process->setCommand({FilePath::fromString(elevate), {"sh"}}); + m_process->setCommand({m_device->mapToGlobalPath(FilePath::fromString(elevate)), {"sh"}}); else - m_process->setCommand({"sh", {}}); + m_process->setCommand({m_device->mapToGlobalPath("sh"), {}}); connect(m_process.get(), &QtcProcess::done, this, &PerfTracePointDialog::handleProcessDone); m_process->start();