feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Change two paths from QString to FilePath

Browse Source 
Fixes: QTCREATORBUG-27144
Change-Id: I41ecc2e96b61a5a8383ef710b558f65e93c5b591
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Erik Verbruggen
2022-04-07 09:49:50 +02:00
committed by Piotr Mućko
parent 87e52ad189
commit 1d63eaee23
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/mcusupport/mcusupportsdk.cpp
View File

@@ -125,7 +125,7 @@ McuAbstractPackage *createBoardSdkPackage(const McuTargetDescription &desc)
return FilePath::fromUserInput(qEnvironmentVariable(envVar)); return FilePath::fromUserInput(qEnvironmentVariable(envVar));
if (!desc.boardSdk.defaultPath.isEmpty()) { if (!desc.boardSdk.defaultPath.isEmpty()) {
FilePath defaultPath = FilePath::fromUserInput(QDir::rootPath() FilePath defaultPath = FilePath::fromUserInput(QDir::rootPath()
+ desc.boardSdk.defaultPath); + desc.boardSdk.defaultPath.toString());
if (defaultPath.exists()) if (defaultPath.exists())
return defaultPath; return defaultPath;
} }
@@ -146,7 +146,7 @@ McuAbstractPackage *createBoardSdkPackage(const McuTargetDescription &desc)
McuAbstractPackage *createFreeRTOSSourcesPackage(const QString &envVar, McuAbstractPackage *createFreeRTOSSourcesPackage(const QString &envVar,
const FilePath &boardSdkDir, const FilePath &boardSdkDir,
const QString &freeRTOSBoardSdkSubDir) const FilePath &freeRTOSBoardSdkSubDir)
{ {
const QString envVarPrefix = removeRtosSuffix(envVar); const QString envVarPrefix = removeRtosSuffix(envVar);
@@ -154,7 +154,7 @@ McuAbstractPackage *createFreeRTOSSourcesPackage(const QString &envVar,
if (qEnvironmentVariableIsSet(envVar.toLatin1())) if (qEnvironmentVariableIsSet(envVar.toLatin1()))
defaultPath = FilePath::fromUserInput(qEnvironmentVariable(envVar.toLatin1())); defaultPath = FilePath::fromUserInput(qEnvironmentVariable(envVar.toLatin1()));
else if (!boardSdkDir.isEmpty() && !freeRTOSBoardSdkSubDir.isEmpty()) else if (!boardSdkDir.isEmpty() && !freeRTOSBoardSdkSubDir.isEmpty())
defaultPath = boardSdkDir / freeRTOSBoardSdkSubDir; defaultPath = boardSdkDir / freeRTOSBoardSdkSubDir.toString();
return new McuPackage(QString::fromLatin1("FreeRTOS Sources (%1)").arg(envVarPrefix), return new McuPackage(QString::fromLatin1("FreeRTOS Sources (%1)").arg(envVarPrefix),
defaultPath, defaultPath,
@@ -542,14 +542,14 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data)
{toolchain.value("id").toString(), toolchainVersionsList, toolchainEntries}, {toolchain.value("id").toString(), toolchainVersionsList, toolchainEntries},
{ {
boardSdk.value("name").toString(), boardSdk.value("name").toString(),
boardSdk.value("defaultPath").toString(), FilePath::fromString(boardSdk.value("defaultPath").toString()),
boardSdk.value("envVar").toString(), boardSdk.value("envVar").toString(),
boardSdkVersionsList, boardSdkVersionsList,
boardSDKEntries, boardSDKEntries,
}, },
{ {
freeRTOS.value("envVar").toString(), freeRTOS.value("envVar").toString(),
freeRTOS.value("boardSdkSubDir").toString(), FilePath::fromString(freeRTOS.value("boardSdkSubDir").toString()),
freeRtosEntries, freeRtosEntries,
}}; }};
} }

2
src/plugins/mcusupport/mcusupportsdk.h
View File

@@ -70,7 +70,7 @@ McuToolChainPackage *createGhsArmToolchainPackage();
McuAbstractPackage *createBoardSdkPackage(const McuTargetDescription &desc); McuAbstractPackage *createBoardSdkPackage(const McuTargetDescription &desc);
McuAbstractPackage *createFreeRTOSSourcesPackage(const QString &envVar, McuAbstractPackage *createFreeRTOSSourcesPackage(const QString &envVar,
const Utils::FilePath &boardSdkDir, const Utils::FilePath &boardSdkDir,
const QString &freeRTOSBoardSdkSubDir); const Utils::FilePath &freeRTOSBoardSdkSubDir);
} // namespace Sdk } // namespace Sdk
} // namespace McuSupport::Internal } // namespace McuSupport::Internal

4
src/plugins/mcusupport/mcutargetdescription.h
View File

@@ -69,7 +69,7 @@ struct McuTargetDescription
struct BoardSdk struct BoardSdk
{ {
QString name; QString name;
QString defaultPath; Utils::FilePath defaultPath;
QString envVar; QString envVar;
QStringList versions; QStringList versions;
QList<PackageDescription> packages; QList<PackageDescription> packages;
@@ -77,7 +77,7 @@ struct McuTargetDescription
struct FreeRTOS struct FreeRTOS
{ {
QString envVar; QString envVar;
QString boardSdkSubDir; Utils::FilePath boardSdkSubDir;
QList<PackageDescription> packages; QList<PackageDescription> packages;
} freeRTOS; } freeRTOS;
}; };

2
src/plugins/mcusupport/test/unittest.cpp
View File

@@ -416,7 +416,7 @@ void McuSupportTest::test_createFreeRtosPackageWithCorrectSetting()
QFETCH(QString, freeRtosEnvVar); QFETCH(QString, freeRtosEnvVar);
QFETCH(QString, expectedSettingsKey); QFETCH(QString, expectedSettingsKey);
auto *package{Sdk::createFreeRTOSSourcesPackage(freeRtosEnvVar, FilePath{}, QString{})}; auto *package{Sdk::createFreeRTOSSourcesPackage(freeRtosEnvVar, FilePath{}, FilePath{})};
QVERIFY(package != nullptr); QVERIFY(package != nullptr);
QCOMPARE(package->settingsKey(), expectedSettingsKey); QCOMPARE(package->settingsKey(), expectedSettingsKey);