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

McuSupport: Remove unavailable JSON param

Browse Source 
freeRTOS' boardSdkSubDir param in JSON was removed long time ago.
It's time to remove corresponding code.

Change-Id: I6805aaa51cce599f5505fbc74692ed562f448ad4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Piotr Mućko
2022-08-12 16:14:27 +02:00
parent 44cd2b59e5
commit 038b839f9e
5 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,16 +151,15 @@ McuPackagePtr createBoardSdkPackage(const SettingsHandler::Ptr &settingsHandler,
McuPackagePtr createFreeRTOSSourcesPackage(const SettingsHandler::Ptr &settingsHandler,
const QString &envVar,
const FilePath &boardSdkDir,
const FilePath &freeRTOSBoardSdkSubDir)
const FilePath &boardSdkDir)
{
const QString envVarPrefix = removeRtosSuffix(envVar);
FilePath defaultPath;
if (qEnvironmentVariableIsSet(envVar.toLatin1()))
defaultPath = FilePath::fromUserInput(qEnvironmentVariable(envVar.toLatin1()));
else if (!boardSdkDir.isEmpty() && !freeRTOSBoardSdkSubDir.isEmpty())
defaultPath = boardSdkDir / freeRTOSBoardSdkSubDir.toString();
else if (!boardSdkDir.isEmpty())
defaultPath = boardSdkDir;
return McuPackagePtr{
new McuPackage(settingsHandler,
@@ -728,7 +727,6 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data)
boardSdkPackage,
{
freeRTOS.value("envVar").toString(),
FilePath::fromUserInput(freeRTOS.value("boardSdkSubDir").toString()),
freeRtosEntries,
}};
}