diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp index 27465380bc3..081eade8abc 100644 --- a/src/plugins/mcusupport/mcupackage.cpp +++ b/src/plugins/mcusupport/mcupackage.cpp @@ -2,8 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "mcupackage.h" -#include "mcusupportconstants.h" -#include "mcusupportsdk.h" #include "mcusupportversiondetection.h" #include "settingshandler.h" diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 59e5325c98a..7f4eb241b48 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -3,12 +3,9 @@ #include "mcusupportoptions.h" -#include "mcukitinformation.h" #include "mcukitmanager.h" -#include "mculegacyconstants.h" #include "mcupackage.h" #include "mcusupportconstants.h" -#include "mcusupportplugin.h" #include "mcusupportsdk.h" #include "mcutarget.h" #include "settingshandler.h" @@ -33,12 +30,12 @@ McuSupportOptions::McuSupportOptions(const SettingsHandler::Ptr &settingsHandler : QObject(parent) , qtForMCUsSdkPackage(createQtForMCUsPackage(settingsHandler)) , settingsHandler(settingsHandler) + , m_automaticKitCreation(settingsHandler->isAutomaticKitCreationEnabled()) { connect(qtForMCUsSdkPackage.get(), &McuAbstractPackage::changed, this, &McuSupportOptions::populatePackagesAndTargets); - m_automaticKitCreation = settingsHandler->isAutomaticKitCreationEnabled(); } void McuSupportOptions::populatePackagesAndTargets() @@ -55,7 +52,7 @@ FilePath McuSupportOptions::qulDocsDir() const return docsDir.exists() ? docsDir : FilePath(); } -void McuSupportOptions::registerQchFiles() +void McuSupportOptions::registerQchFiles() const { const QString docsDir = qulDocsDir().toString(); if (docsDir.isEmpty()) @@ -67,7 +64,7 @@ void McuSupportOptions::registerQchFiles() [](const QFileInfo &fi) { return fi.absoluteFilePath(); })); } -void McuSupportOptions::registerExamples() +void McuSupportOptions::registerExamples() const { const FilePath docsDir = qulDocsDir(); if (docsDir.isEmpty()) diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h index d8d6cf6a976..945c748dff0 100644 --- a/src/plugins/mcusupport/mcusupportoptions.h +++ b/src/plugins/mcusupport/mcusupportoptions.h @@ -48,12 +48,12 @@ public: McuSdkRepository sdkRepository; void setQulDir(const Utils::FilePath &dir); - Utils::FilePath qulDirFromSettings() const; - Utils::FilePath qulDocsDir() const; + [[nodiscard]] Utils::FilePath qulDirFromSettings() const; + [[nodiscard]] Utils::FilePath qulDocsDir() const; static McuKitManager::UpgradeOption askForKitUpgrades(); - void registerQchFiles(); - void registerExamples(); + void registerQchFiles() const; + void registerExamples() const; static const QVersionNumber &minimalQulVersion(); static bool isLegacyVersion(const QVersionNumber &version); @@ -63,7 +63,7 @@ public: static bool kitsNeedQtVersion(); - bool automaticKitCreationEnabled() const; + [[nodiscard]] bool automaticKitCreationEnabled() const; void setAutomaticKitCreationEnabled(const bool enabled); private: diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp index ef46e882e1f..35f663d8e60 100644 --- a/src/plugins/mcusupport/mcusupportoptionspage.cpp +++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp @@ -41,7 +41,7 @@ public: void updateStatus(); void showMcuTargetPackages(); - McuTargetPtr currentMcuTarget() const; + [[nodiscard]] McuTargetPtr currentMcuTarget() const; private: void apply() final; @@ -73,7 +73,7 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(McuSupportOptions &options, : m_options{options} , m_settingsHandler(settingsHandler) { - auto mainLayout = new QVBoxLayout(this); + auto *mainLayout = new QVBoxLayout(this); { m_statusInfoLabel = new Utils::InfoLabel; @@ -88,7 +88,7 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(McuSupportOptions &options, { m_qtForMCUsSdkGroupBox = new QGroupBox(m_options.qtForMCUsSdkPackage->label()); m_qtForMCUsSdkGroupBox->setFlat(true); - auto layout = new QVBoxLayout(m_qtForMCUsSdkGroupBox); + auto *layout = new QVBoxLayout(m_qtForMCUsSdkGroupBox); layout->addWidget(m_options.qtForMCUsSdkPackage->widget()); mainLayout->addWidget(m_qtForMCUsSdkGroupBox); } @@ -99,7 +99,7 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(McuSupportOptions &options, m_mcuTargetsGroupBox->setFlat(true); mainLayout->addWidget(m_mcuTargetsGroupBox); m_mcuTargetsComboBox = new QComboBox; - auto layout = new QVBoxLayout(m_mcuTargetsGroupBox); + auto *layout = new QVBoxLayout(m_mcuTargetsGroupBox); layout->addWidget(m_mcuTargetsComboBox); connect(m_mcuTargetsComboBox, &QComboBox::currentTextChanged, @@ -138,7 +138,7 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(McuSupportOptions &options, m_kitCreationGroupBox->setFlat(true); mainLayout->addWidget(m_kitCreationGroupBox); m_kitCreationInfoLabel = new Utils::InfoLabel; - auto vLayout = new QHBoxLayout(m_kitCreationGroupBox); + auto *vLayout = new QHBoxLayout(m_kitCreationGroupBox); vLayout->addWidget(m_kitCreationInfoLabel); m_kitCreationPushButton = new QPushButton(tr("Create Kit")); m_kitCreationPushButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); @@ -150,8 +150,8 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(McuSupportOptions &options, m_kitUpdatePushButton = new QPushButton(tr("Update Kit")); m_kitUpdatePushButton->setSizePolicy(m_kitCreationPushButton->sizePolicy()); connect(m_kitUpdatePushButton, &QPushButton::clicked, this, [this] { - for (auto kit : McuKitManager::upgradeableKits(currentMcuTarget().get(), - m_options.qtForMCUsSdkPackage)) + for (auto *kit : McuKitManager::upgradeableKits(currentMcuTarget().get(), + m_options.qtForMCUsSdkPackage)) McuKitManager::upgradeKitInPlace(kit, currentMcuTarget().get(), m_options.qtForMCUsSdkPackage); @@ -289,7 +289,7 @@ void McuSupportOptionsWidget::apply() m_settingsHandler->setAutomaticKitCreation(m_options.automaticKitCreationEnabled()); pathsChanged |= m_options.qtForMCUsSdkPackage->writeToSettings(); - for (auto package : qAsConst(m_options.sdkRepository.packages)) + for (const auto &package : qAsConst(m_options.sdkRepository.packages)) pathsChanged |= package->writeToSettings(); if (pathsChanged) { diff --git a/src/plugins/mcusupport/mcusupportplugin.h b/src/plugins/mcusupport/mcusupportplugin.h index 313e7056d91..320749b27d6 100644 --- a/src/plugins/mcusupport/mcusupportplugin.h +++ b/src/plugins/mcusupport/mcusupportplugin.h @@ -3,7 +3,6 @@ #pragma once -#include "mcusupport_global.h" #include "settingshandler.h" #include diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 89a3222cb60..04ce9a38770 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -64,7 +64,7 @@ static FilePath findInProgramFiles(const QString &folder) for (const auto &envVar : QStringList{"ProgramFiles", "ProgramFiles(x86)", "ProgramW6432"}) { if (!qtcEnvironmentVariableIsSet(envVar)) continue; - const FilePath dir = FilePath::fromUserInput(qtcEnvironmentVariable(envVar)) / folder; + FilePath dir = FilePath::fromUserInput(qtcEnvironmentVariable(envVar)) / folder; if (dir.exists()) return dir; } @@ -114,7 +114,7 @@ McuPackagePtr createBoardSdkPackage(const SettingsHandler::Ptr &settingsHandler, return FilePath(); }(); - const auto versionDetector = generatePackageVersionDetector(desc.boardSdk.envVar); + const auto *versionDetector = generatePackageVersionDetector(desc.boardSdk.envVar); return McuPackagePtr{new McuPackage(settingsHandler, sdkName, @@ -190,10 +190,9 @@ McuToolChainPackagePtr createMsvcToolChainPackage(const SettingsHandler::Ptr &se const FilePath detectionPath = FilePath("cl").withExecutableSuffix(); const FilePath defaultPath = toolChain ? toolChain->compilerCommand().parentDir() : FilePath(); - const auto versionDetector - = new McuPackageExecutableVersionDetector(detectionPath, - {"--version"}, - "\\b(\\d+\\.\\d+)\\.\\d+\\b"); + const auto *versionDetector = new McuPackageExecutableVersionDetector(detectionPath, + {"--version"}, + R"(\b(\d+\.\d+)\.\d+\b)"); return McuToolChainPackagePtr{new McuToolChainPackage(settingsHandler, McuPackage::tr("MSVC Binary directory"), @@ -217,10 +216,9 @@ McuToolChainPackagePtr createGccToolChainPackage(const SettingsHandler::Ptr &set const FilePath defaultPath = toolChain ? toolChain->compilerCommand().parentDir().parentDir() : FilePath(); - const auto versionDetector - = new McuPackageExecutableVersionDetector(detectionPath, - {"--version"}, - "\\b(\\d+\\.\\d+\\.\\d+)\\b"); + const auto *versionDetector = new McuPackageExecutableVersionDetector(detectionPath, + {"--version"}, + R"(\b(\d+\.\d+\.\d+)\b)"); return McuToolChainPackagePtr{new McuToolChainPackage(settingsHandler, McuPackage::tr("GCC Toolchain"), @@ -254,9 +252,9 @@ McuToolChainPackagePtr createArmGccToolchainPackage(const SettingsHandler::Ptr & } const FilePath detectionPath = FilePath("bin/arm-none-eabi-g++").withExecutableSuffix(); - const auto versionDetector = new McuPackageExecutableVersionDetector(detectionPath, - {"--version"}, - R"(\b(\d+\.\d+\.\d+)\b)"); + const auto *versionDetector = new McuPackageExecutableVersionDetector(detectionPath, + {"--version"}, + R"(\b(\d+\.\d+\.\d+)\b)"); return McuToolChainPackagePtr{ new McuToolChainPackage(settingsHandler, @@ -278,7 +276,7 @@ McuToolChainPackagePtr createGhsToolchainPackage(const SettingsHandler::Ptr &set const FilePath defaultPath = FilePath::fromUserInput(qtcEnvironmentVariable(envVar)); - const auto versionDetector + const auto *versionDetector = new McuPackageExecutableVersionDetector(FilePath("as850").withExecutableSuffix(), {"-V"}, R"(\bv(\d+\.\d+\.\d+)\b)"); @@ -303,7 +301,7 @@ McuToolChainPackagePtr createGhsArmToolchainPackage(const SettingsHandler::Ptr & const FilePath defaultPath = FilePath::fromUserInput(qtcEnvironmentVariable(envVar)); - const auto versionDetector + const auto *versionDetector = new McuPackageExecutableVersionDetector(FilePath("asarm").withExecutableSuffix(), {"-V"}, R"(\bv(\d+\.\d+\.\d+)\b)"); @@ -679,11 +677,6 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data) [&](const QVariant &version) { return version.toString(); }); - const QVariantList boardSdkVersions = boardSdk.value("versions").toArray().toVariantList(); - const auto boardSdkVersionsList = Utils::transform(boardSdkVersions, - [&](const QVariant &version) { - return version.toString(); - }); const QVariantList colorDepths = platform.value("colorDepths").toArray().toVariantList(); const auto colorDepthsVector = Utils::transform>(colorDepths, @@ -710,7 +703,7 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data) } // https://doc.qt.io/qtcreator/creator-developing-mcu.html#supported-qt-for-mcus-sdks -static const QString legacySupportVersionFor(const QString &sdkVersion) +static QString legacySupportVersionFor(const QString &sdkVersion) { static const QHash oldSdkQtcRequiredVersion = {{{"1.0"}, {"4.11.x"}}, {{"1.1"}, {"4.12.0 or 4.12.1"}}, {{"1.2"}, {"4.12.2 or 4.12.3"}}}; diff --git a/src/plugins/mcusupport/mcutarget.h b/src/plugins/mcusupport/mcutarget.h index c90807c5466..d42cf015d73 100644 --- a/src/plugins/mcusupport/mcutarget.h +++ b/src/plugins/mcusupport/mcutarget.h @@ -3,7 +3,6 @@ #pragma once -#include "mcupackage.h" #include "mcusupport_global.h" #include diff --git a/src/plugins/mcusupport/mcutargetfactory.cpp b/src/plugins/mcusupport/mcutargetfactory.cpp index a46490d45ea..e6fb8c41d58 100644 --- a/src/plugins/mcusupport/mcutargetfactory.cpp +++ b/src/plugins/mcusupport/mcutargetfactory.cpp @@ -4,7 +4,6 @@ #include "mcutargetfactory.h" #include "mcuhelpers.h" #include "mcupackage.h" -#include "mcusupportconstants.h" #include "mcusupportversiondetection.h" #include "mcutarget.h" #include "mcutargetdescription.h" diff --git a/src/plugins/mcusupport/settingshandler.cpp b/src/plugins/mcusupport/settingshandler.cpp index f687a284e91..1f3732a9954 100644 --- a/src/plugins/mcusupport/settingshandler.cpp +++ b/src/plugins/mcusupport/settingshandler.cpp @@ -4,7 +4,6 @@ #include "settingshandler.h" #include "mcusupportconstants.h" -#include "mcusupportsdk.h" #include #include diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index f9cd16179f6..8b34b95951c 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -3,7 +3,6 @@ #include "unittest.h" -#include "armgcc_ek_ra6m3g_baremetal_json.h" #include "armgcc_mimxrt1050_evk_freertos_json.h" #include "armgcc_mimxrt1064_evk_freertos_json.h" #include "armgcc_mimxrt1170_evk_freertos_json.h" @@ -13,13 +12,13 @@ #include "gcc_desktop_json.h" #include "ghs_rh850_d1m1a_baremetal_json.h" #include "iar_mimxrt1064_evk_freertos_json.h" -#include "iar_mimxrt1170_evk_freertos_json.h" #include "iar_stm32f469i_discovery_baremetal_json.h" #include "msvc_desktop_json.h" #include "mcuhelpers.h" #include "mcukitmanager.h" #include "mculegacyconstants.h" +#include "mcupackage.h" #include "mcusupportconstants.h" #include "mcusupportoptions.h" #include "mcusupportsdk.h" @@ -55,16 +54,12 @@ namespace McuSupport::Internal::Test { using namespace Utils; -using Legacy::Constants::BOARD_SDK_CMAKE_VAR; -using Legacy::Constants::QT_FOR_MCUS_SDK_PACKAGE_VALIDATION_PATH; using Legacy::Constants::QUL_CMAKE_VAR; using Legacy::Constants::QUL_ENV_VAR; using Legacy::Constants::QUL_LABEL; -using Legacy::Constants::SETTINGS_KEY_FREERTOS_PREFIX; using Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE; using Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE; -using CMakeProjectManager::CMakeConfigItem; using CMakeProjectManager::CMakeConfigurationKitAspect; using ProjectExplorer::Kit; using ProjectExplorer::KitManager; @@ -90,7 +85,6 @@ const char msvcVersion[]{"14.29"}; const char boardSdkVersion[]{"2.12.0"}; const QString boardSdkCmakeVar{Legacy::Constants::BOARD_SDK_CMAKE_VAR}; const char boardSdkDir[]{"/opt/Qul/2.3.0/boardDir/"}; -const char cmakeToolchainLabel[]{"CMake Toolchain File"}; const char fallbackDir[]{"/abc/def/fallback"}; const char freeRtosCMakeVar[]{"FREERTOS_DIR"}; const char freeRtosEnvVar[]{"EVK_MIMXRT1170_FREERTOS_PATH"}; @@ -123,10 +117,8 @@ const char nxp1064[]{"IMXRT1064"}; const char nxp1170FreeRtosEnvVar[]{"EVK_MIMXRT1170_FREERTOS_PATH"}; const char nxp1170[]{"EVK_MIMXRT1170"}; const char qtForMcuSdkPath[]{"/opt/qtformcu/2.2"}; -const char qulLabel[]{"Qt for MCUs SDK"}; const char stm32f7FreeRtosEnvVar[]{"STM32F7_FREERTOS_DIR"}; const char stm32f7[]{"STM32F7"}; -const char unsupported[]{"unsupported"}; const char vendor[]{"target_vendor"}; const QString settingsPrefix = QLatin1String(Constants::SETTINGS_GROUP) + '/' + QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX); @@ -165,13 +157,12 @@ void verifyIarToolchain(const McuToolChainPackagePtr &iarToolchainPackage) { ProjectExplorer::ToolChainFactory toolchainFactory; Id iarId{BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID}; - ToolChain *iarToolchain{toolchainFactory.createToolChain(iarId)}; + ToolChain *iarToolchain{ProjectExplorer::ToolChainFactory::createToolChain(iarId)}; iarToolchain->setLanguage(cxxLanguageId); - ToolChainManager::instance()->registerToolChain(iarToolchain); + ToolChainManager::registerToolChain(iarToolchain); QVERIFY(iarToolchainPackage != nullptr); - QCOMPARE(iarToolchainPackage->cmakeVariableName(), - Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE); + QCOMPARE(iarToolchainPackage->cmakeVariableName(), TOOLCHAIN_DIR_CMAKE_VARIABLE); QCOMPARE(iarToolchainPackage->environmentVariableName(), iarEnvVar); QCOMPARE(iarToolchainPackage->isDesktopToolchain(), false); QCOMPARE(iarToolchainPackage->toolChainName(), iar); @@ -190,12 +181,12 @@ void verifyArmGccToolchain(const McuToolChainPackagePtr &armGccPackage, const QS ProjectExplorer::ToolChainFactory toolchainFactory; Id armGccId{ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID}; - ToolChain *armToolchain{toolchainFactory.createToolChain(armGccId)}; + ToolChain *armToolchain{ProjectExplorer::ToolChainFactory::createToolChain(armGccId)}; armToolchain->setLanguage(cxxLanguageId); - ToolChainManager::instance()->registerToolChain(armToolchain); + ToolChainManager::registerToolChain(armToolchain); QVERIFY(armGccPackage != nullptr); - QCOMPARE(armGccPackage->cmakeVariableName(), Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE); + QCOMPARE(armGccPackage->cmakeVariableName(), TOOLCHAIN_DIR_CMAKE_VARIABLE); QCOMPARE(armGccPackage->environmentVariableName(), armGccEnvVar); QCOMPARE(armGccPackage->isDesktopToolchain(), false); QCOMPARE(armGccPackage->toolChainName(), armGcc); @@ -242,15 +233,14 @@ void verifyTargetToolchains(const Targets &targets, const auto toolchainFile{target->toolChainFilePackage()}; QVERIFY(toolchainFile); - QCOMPARE(toolchainFile->cmakeVariableName(), Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE); + QCOMPARE(toolchainFile->cmakeVariableName(), TOOLCHAIN_FILE_CMAKE_VARIABLE); QCOMPARE(toolchainFile->settingsKey(), empty); QCOMPARE(toolchainFile->path().toString(), toolchainFilePath); QCOMPARE(toolchainFile->defaultPath().toString(), toolchainFileDefaultPath); const auto toolchainCompiler{target->toolChainPackage()}; QVERIFY(toolchainCompiler); - QCOMPARE(toolchainCompiler->cmakeVariableName(), - Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE); + QCOMPARE(toolchainCompiler->cmakeVariableName(), TOOLCHAIN_DIR_CMAKE_VARIABLE); QCOMPARE(toolchainCompiler->path().toString(), compilerPath); QCOMPARE(toolchainCompiler->settingsKey(), compilerSetting); QCOMPARE(toolchainCompiler->versions(), versions); @@ -292,7 +282,6 @@ void verifyPackage(const McuPackagePtr &package, const QString &cmakeVar, const QString &envVar, const QString &label, - const QString &detectionPath, const QStringList &versions) { QVERIFY(package); @@ -307,8 +296,8 @@ void verifyPackage(const McuPackagePtr &package, McuSupportTest::McuSupportTest() : targetFactory{settingsMockPtr} - , compilerDescription{armGccLabel, armGccEnvVar, Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE, armGccLabel, armGccDirectorySetting, {}, {}, {}, {}, false} - , toochainFileDescription{armGccLabel, armGccEnvVar, Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE, armGccLabel, armGccDirectorySetting, {}, {}, {}, {}, false} + , compilerDescription{armGccLabel, armGccEnvVar, TOOLCHAIN_DIR_CMAKE_VARIABLE, armGccLabel, armGccDirectorySetting, {}, {}, {}, {}, false} + , toochainFileDescription{armGccLabel, armGccEnvVar, TOOLCHAIN_FILE_CMAKE_VARIABLE, armGccLabel, armGccDirectorySetting, {}, {}, {}, {}, false} , targetDescription { "2.0.1", "2", @@ -336,7 +325,7 @@ McuSupportTest::McuSupportTest() armGccDirectorySetting, McuToolChainPackage::ToolChainType::ArmGcc, {armGccVersion}, - Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE, + TOOLCHAIN_DIR_CMAKE_VARIABLE, armGccEnvVar, nullptr}} , iarToolchainPackagePtr{new McuToolChainPackage{settingsMockPtr, @@ -346,7 +335,7 @@ McuSupportTest::McuSupportTest() iarSetting, McuToolChainPackage::ToolChainType::IAR, {armGccVersion}, - Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE, + TOOLCHAIN_DIR_CMAKE_VARIABLE, iarEnvVar, nullptr}} , platform{id, name, vendor} @@ -386,7 +375,7 @@ void McuSupportTest::initTestCase() EXPECT_CALL(*armGccToolchainFilePackage, environmentVariableName()) .WillRepeatedly(Return(QString{QString{}})); EXPECT_CALL(*armGccToolchainFilePackage, cmakeVariableName()) - .WillRepeatedly(Return(QString{Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE})); + .WillRepeatedly(Return(QString{TOOLCHAIN_FILE_CMAKE_VARIABLE})); EXPECT_CALL(*armGccToolchainFilePackage, isValidStatus()).WillRepeatedly(Return(true)); EXPECT_CALL(*armGccToolchainFilePackage, path()) .WillRepeatedly(Return(FilePath::fromUserInput(armGccToolchainFilePath))); @@ -422,7 +411,7 @@ void McuSupportTest::test_parseCmakeEntries() { const auto description{parseDescriptionJson(iar_mimxrt1064_evk_freertos_json)}; - auto &freeRtos = description.freeRTOS.package; + const auto &freeRtos = description.freeRTOS.package; QCOMPARE(freeRtos.envVar, nxp1064FreeRtosEnvVar); } @@ -468,13 +457,13 @@ void McuSupportTest::test_parseToolchainFromJSON() QCOMPARE(description.toolchain.id, id); const PackageDescription &compilerPackage{description.toolchain.compiler}; - QCOMPARE(compilerPackage.cmakeVar, Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE); + QCOMPARE(compilerPackage.cmakeVar, TOOLCHAIN_DIR_CMAKE_VARIABLE); QCOMPARE(compilerPackage.envVar, environmentVariable); const PackageDescription &toolchainFilePackage{description.toolchain.file}; QCOMPARE(toolchainFilePackage.label, QString{}); QCOMPARE(toolchainFilePackage.envVar, QString{}); - QCOMPARE(toolchainFilePackage.cmakeVar, Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE); + QCOMPARE(toolchainFilePackage.cmakeVar, TOOLCHAIN_FILE_CMAKE_VARIABLE); QCOMPARE(toolchainFilePackage.defaultPath.cleanPath().toString(), toolchainFileDefaultPath); } @@ -666,24 +655,22 @@ void McuSupportTest::test_createTargets() // all packages should contain target's tooclhain compiler package. QVERIFY(anyOf(packages, [](const McuPackagePtr &pkg) { - return (pkg->cmakeVariableName() == Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE); + return (pkg->cmakeVariableName() == TOOLCHAIN_DIR_CMAKE_VARIABLE); })); // target should contain tooclhain copmiler package. QVERIFY(anyOf(tgtPackages, [](const McuPackagePtr &pkg) { - return (pkg->cmakeVariableName() - == Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE /*and pkg->disconnect*/); + return (pkg->cmakeVariableName() == TOOLCHAIN_DIR_CMAKE_VARIABLE); })); // all packages should contain target's tooclhain file package. QVERIFY(anyOf(packages, [](const McuPackagePtr &pkg) { - return (pkg->cmakeVariableName() == Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE); + return (pkg->cmakeVariableName() == TOOLCHAIN_FILE_CMAKE_VARIABLE); })); // target should contain tooclhain file package. QVERIFY(anyOf(tgtPackages, [](const McuPackagePtr &pkg) { - return (pkg->cmakeVariableName() - == Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE /*and pkg->disconnect*/); + return (pkg->cmakeVariableName() == TOOLCHAIN_FILE_CMAKE_VARIABLE); })); } @@ -736,7 +723,7 @@ void McuSupportTest::test_useFallbackPathForToolchainWhenPathFromSettingsIsNotAv { PackageDescription compilerDescription{armGcc, armGccEnvVar, - Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE, + TOOLCHAIN_DIR_CMAKE_VARIABLE, armGcc, armGccDirectorySetting, fallbackDir, @@ -759,7 +746,7 @@ void McuSupportTest::test_usePathFromSettingsForToolchainPath() { PackageDescription compilerDescription{{}, armGccEnvVar, - Legacy::Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE, + TOOLCHAIN_DIR_CMAKE_VARIABLE, armGcc, armGccDirectorySetting, empty, @@ -798,10 +785,11 @@ void McuSupportTest::test_addNewKit() const auto config = CMakeConfigurationKitAspect::configuration(newKit); QVERIFY(!config.empty()); - QVERIFY( - indexOf(config.toVector(), - [&cmakeVar](const CMakeConfigItem &item) { return item.key == cmakeVar.toUtf8(); }) - != -1); + QVERIFY(indexOf(config.toVector(), + [&cmakeVar](const CMakeProjectManager::CMakeConfigItem &item) { + return item.key == cmakeVar.toUtf8(); + }) + != -1); } void McuSupportTest::test_getFullToolchainFilePathFromTarget() @@ -835,8 +823,7 @@ void McuSupportTest::test_legacy_createUnsupportedToolchainFilePackage() auto unsupportedToolchainFile = legacyTargetFactory.getToolchainFile(qtForMcuSdkPath, iar); QVERIFY(unsupportedToolchainFile); QCOMPARE(unsupportedToolchainFile->path().toString(), unsupportedToolchainFilePath); - QCOMPARE(unsupportedToolchainFile->cmakeVariableName(), - Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE); + QCOMPARE(unsupportedToolchainFile->cmakeVariableName(), TOOLCHAIN_FILE_CMAKE_VARIABLE); } void McuSupportTest::test_legacy_createTargetWithToolchainPackages_data() @@ -946,7 +933,6 @@ void McuSupportTest::test_createTargetWithToolchainPackages() QUL_CMAKE_VAR, QUL_ENV_VAR, QUL_LABEL, - Legacy::Constants::QT_FOR_MCUS_SDK_PACKAGE_VALIDATION_PATH, {}); verifyTargetToolchains(targets, @@ -966,8 +952,7 @@ void McuSupportTest::test_addToolchainFileInfoToKit() const auto &cmakeConfig{CMakeConfigurationKitAspect::configuration(&kit)}; QVERIFY(!cmakeConfig.empty()); - QCOMPARE(cmakeConfig.valueOf(Legacy::Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE), - armGccToolchainFilePath); + QCOMPARE(cmakeConfig.valueOf(TOOLCHAIN_FILE_CMAKE_VARIABLE), armGccToolchainFilePath); } void McuSupportTest::test_legacy_createBoardSdk_data()