From 1d63eaee238824af2ed59c748a9a8c33977cf52f Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik@verbruggen.consulting>
Date: Thu, 7 Apr 2022 09:49:50 +0200
Subject: [PATCH] Change two paths from QString to FilePath
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: QTCREATORBUG-27144
Change-Id: I41ecc2e96b61a5a8383ef710b558f65e93c5b591
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/mcusupport/mcusupportsdk.cpp      | 10 +++++-----
 src/plugins/mcusupport/mcusupportsdk.h        |  2 +-
 src/plugins/mcusupport/mcutargetdescription.h |  4 ++--
 src/plugins/mcusupport/test/unittest.cpp      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp
index b06538d543a..8d3dbf177dd 100644
--- a/src/plugins/mcusupport/mcusupportsdk.cpp
+++ b/src/plugins/mcusupport/mcusupportsdk.cpp
@@ -125,7 +125,7 @@ McuAbstractPackage *createBoardSdkPackage(const McuTargetDescription &desc)
             return FilePath::fromUserInput(qEnvironmentVariable(envVar));
         if (!desc.boardSdk.defaultPath.isEmpty()) {
             FilePath defaultPath = FilePath::fromUserInput(QDir::rootPath()
-                                                           + desc.boardSdk.defaultPath);
+                                                           + desc.boardSdk.defaultPath.toString());
             if (defaultPath.exists())
                 return defaultPath;
         }
@@ -146,7 +146,7 @@ McuAbstractPackage *createBoardSdkPackage(const McuTargetDescription &desc)
 
 McuAbstractPackage *createFreeRTOSSourcesPackage(const QString &envVar,
                                                  const FilePath &boardSdkDir,
-                                                 const QString &freeRTOSBoardSdkSubDir)
+                                                 const FilePath &freeRTOSBoardSdkSubDir)
 {
     const QString envVarPrefix = removeRtosSuffix(envVar);
 
@@ -154,7 +154,7 @@ McuAbstractPackage *createFreeRTOSSourcesPackage(const QString &envVar,
     if (qEnvironmentVariableIsSet(envVar.toLatin1()))
         defaultPath = FilePath::fromUserInput(qEnvironmentVariable(envVar.toLatin1()));
     else if (!boardSdkDir.isEmpty() && !freeRTOSBoardSdkSubDir.isEmpty())
-        defaultPath = boardSdkDir / freeRTOSBoardSdkSubDir;
+        defaultPath = boardSdkDir / freeRTOSBoardSdkSubDir.toString();
 
     return new McuPackage(QString::fromLatin1("FreeRTOS Sources (%1)").arg(envVarPrefix),
                           defaultPath,
@@ -542,14 +542,14 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data)
             {toolchain.value("id").toString(), toolchainVersionsList, toolchainEntries},
             {
                 boardSdk.value("name").toString(),
-                boardSdk.value("defaultPath").toString(),
+                FilePath::fromString(boardSdk.value("defaultPath").toString()),
                 boardSdk.value("envVar").toString(),
                 boardSdkVersionsList,
                 boardSDKEntries,
             },
             {
                 freeRTOS.value("envVar").toString(),
-                freeRTOS.value("boardSdkSubDir").toString(),
+                FilePath::fromString(freeRTOS.value("boardSdkSubDir").toString()),
                 freeRtosEntries,
             }};
 }
diff --git a/src/plugins/mcusupport/mcusupportsdk.h b/src/plugins/mcusupport/mcusupportsdk.h
index c52f0d7a53b..34bc3c43fc8 100644
--- a/src/plugins/mcusupport/mcusupportsdk.h
+++ b/src/plugins/mcusupport/mcusupportsdk.h
@@ -70,7 +70,7 @@ McuToolChainPackage *createGhsArmToolchainPackage();
 McuAbstractPackage *createBoardSdkPackage(const McuTargetDescription &desc);
 McuAbstractPackage *createFreeRTOSSourcesPackage(const QString &envVar,
                                                  const Utils::FilePath &boardSdkDir,
-                                                 const QString &freeRTOSBoardSdkSubDir);
+                                                 const Utils::FilePath &freeRTOSBoardSdkSubDir);
 
 } // namespace Sdk
 } // namespace McuSupport::Internal
diff --git a/src/plugins/mcusupport/mcutargetdescription.h b/src/plugins/mcusupport/mcutargetdescription.h
index 8132df64faa..cce2c8e310d 100644
--- a/src/plugins/mcusupport/mcutargetdescription.h
+++ b/src/plugins/mcusupport/mcutargetdescription.h
@@ -69,7 +69,7 @@ struct McuTargetDescription
     struct BoardSdk
     {
         QString name;
-        QString defaultPath;
+        Utils::FilePath defaultPath;
         QString envVar;
         QStringList versions;
         QList<PackageDescription> packages;
@@ -77,7 +77,7 @@ struct McuTargetDescription
     struct FreeRTOS
     {
         QString envVar;
-        QString boardSdkSubDir;
+        Utils::FilePath boardSdkSubDir;
         QList<PackageDescription> packages;
     } freeRTOS;
 };
diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index b164f20010c..1c9feba4aef 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -416,7 +416,7 @@ void McuSupportTest::test_createFreeRtosPackageWithCorrectSetting()
     QFETCH(QString, freeRtosEnvVar);
     QFETCH(QString, expectedSettingsKey);
 
-    auto *package{Sdk::createFreeRTOSSourcesPackage(freeRtosEnvVar, FilePath{}, QString{})};
+    auto *package{Sdk::createFreeRTOSSourcesPackage(freeRtosEnvVar, FilePath{}, FilePath{})};
     QVERIFY(package != nullptr);
 
     QCOMPARE(package->settingsKey(), expectedSettingsKey);