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,
}};
}

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

@@ -74,8 +74,7 @@ McuToolChainPackagePtr createGhsArmToolchainPackage(const SettingsHandler::Ptr &
McuPackagePtr createBoardSdkPackage(const SettingsHandler::Ptr &, const McuTargetDescription &);
McuPackagePtr createFreeRTOSSourcesPackage(const SettingsHandler::Ptr &settingsHandler,
const QString &envVar,
const Utils::FilePath &boardSdkDir,
const Utils::FilePath &freeRTOSBoardSdkSubDir);
const Utils::FilePath &boardSdkDir);
} // namespace Legacy
} // namespace McuSupport::Internal

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

@@ -82,7 +82,6 @@ struct McuTargetDescription
struct FreeRTOS
{
QString envVar;
Utils::FilePath boardSdkSubDir;
QList<PackageDescription> packages;
} freeRTOS;
};

6
src/plugins/mcusupport/mcutargetfactorylegacy.cpp
View File

@@ -83,13 +83,11 @@ QPair<Targets, Packages> McuTargetFactory::createTargets(const McuTargetDescript
// Free RTOS specific settings.
if (!desc.freeRTOS.envVar.isEmpty()) {
if (!freeRTOSPkgs.contains(desc.freeRTOS.envVar)) {
freeRTOSPkgs
.insert(desc.freeRTOS.envVar,
freeRTOSPkgs.insert(desc.freeRTOS.envVar,
McuPackagePtr{
Legacy::createFreeRTOSSourcesPackage(settingsHandler,
desc.freeRTOS.envVar,
boardSdkDefaultPath,
desc.freeRTOS.boardSdkSubDir)});
boardSdkDefaultPath)});
}
required3rdPartyPkgs.insert(freeRTOSPkgs.value(desc.freeRTOS.envVar));
}

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

@@ -30,10 +30,10 @@
#include "armgcc_stm32f769i_freertos_json.h"
#include "armgcc_stm32h750b_metal_json.h"
#include "gcc_desktop_json.h"
#include "msvc_desktop_json.h"
#include "ghs_rh850_d1m1a_baremetal_json.h"
#include "iar_nxp_1064_json.h"
#include "iar_stm32f469i_metal_json.h"
#include "msvc_desktop_json.h"
#include "mcuhelpers.h"
#include "mcukitmanager.h"
@@ -365,7 +365,6 @@ void McuSupportTest::test_parseBasicInfoFromJson()
const auto description = parseDescriptionJson(iar_nxp_1064_json);
QVERIFY(!description.freeRTOS.envVar.isEmpty());
QVERIFY(description.freeRTOS.boardSdkSubDir.isEmpty());
}
void McuSupportTest::test_parseCmakeEntries()
@@ -604,10 +603,8 @@ void McuSupportTest::test_createFreeRtosPackageWithCorrectSetting()
QFETCH(QString, freeRtosEnvVar);
QFETCH(QString, expectedSettingsKey);
McuPackagePtr package{Legacy::createFreeRTOSSourcesPackage(settingsMockPtr,
freeRtosEnvVar,
FilePath{},
FilePath{})};
McuPackagePtr package{
Legacy::createFreeRTOSSourcesPackage(settingsMockPtr, freeRtosEnvVar, FilePath{})};
QVERIFY(package != nullptr);
QCOMPARE(package->settingsKey(), expectedSettingsKey);