From 06b276f68fdcaed075a0fd6f761e735ac3d7f921 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 23 May 2023 16:13:11 +0200
Subject: [PATCH] McuSupport: Use new FilePathAspect for FilePaths

Change-Id: I98cb17f39af624f1ec06529932d4e52cda5a3661
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/mcusupport/mcubuildstep.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/plugins/mcusupport/mcubuildstep.cpp b/src/plugins/mcusupport/mcubuildstep.cpp
index a26e8ed0d1e..86f5e8af7e6 100644
--- a/src/plugins/mcusupport/mcubuildstep.cpp
+++ b/src/plugins/mcusupport/mcubuildstep.cpp
@@ -58,9 +58,8 @@ DeployMcuProcessStep::DeployMcuProcessStep(ProjectExplorer::BuildStepList *bc, U
     QString root = findKitInformation(kit, Internal::Legacy::Constants::QUL_CMAKE_VAR);
     auto rootPath = Utils::FilePath::fromString(root);
 
-    auto cmd = addAspect<Utils::StringAspect>();
+    auto cmd = addAspect<Utils::FilePathAspect>();
     cmd->setSettingsKey("QmlProject.Mcu.ProcessStep.Command");
-    cmd->setDisplayStyle(Utils::StringAspect::PathChooserDisplay);
     cmd->setExpectedKind(Utils::PathChooser::Command);
     cmd->setLabelText(QmlProjectManager::Tr::tr("Command:"));
     cmd->setFilePath(rootPath.pathAppended("/bin/qmlprojectexporter"));
@@ -87,9 +86,8 @@ DeployMcuProcessStep::DeployMcuProcessStep(ProjectExplorer::BuildStepList *bc, U
     args->setLabelText(QmlProjectManager::Tr::tr("Arguments:"));
     args->setValue(Utils::ProcessArgs::joinArgs(arguments));
 
-    auto outDir = addAspect<Utils::StringAspect>();
+    auto outDir = addAspect<Utils::FilePathAspect>();
     outDir->setSettingsKey("QmlProject.Mcu.ProcessStep.BuildDirectory");
-    outDir->setDisplayStyle(Utils::StringAspect::PathChooserDisplay);
     outDir->setExpectedKind(Utils::PathChooser::Directory);
     outDir->setLabelText(QmlProjectManager::Tr::tr("Build directory:"));
     outDir->setPlaceHolderText(m_tmpDir.path());