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

Merge "Merge remote-tracking branch 'origin/10.0' into tr" into 11.0

Browse Source
This commit is contained in:
The Qt Project
2023-06-15 07:47:28 +00:00
parent a0e9ff592f 68915713bf
commit 580202f54b
6 changed files with 136 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangformat/clangformatindenter.cpp
View File

@@ -32,7 +32,7 @@ static bool isBeautifierPluginActivated()
return std::find_if(specs.begin(),
specs.end(),
[](ExtensionSystem::PluginSpec *spec) {
return spec->name() == "Beautifier";
return spec->name() == "Beautifier" && spec->isEffectivelyEnabled();
})
!= specs.end();
}

4
src/plugins/clangformat/llvmfilesystem.h
View File

@@ -50,7 +50,7 @@ public:
Q_UNUSED(RequiresNullTerminator);
Q_UNUSED(IsVolatile);
const FilePath path = FilePath::fromString(QString::fromStdString(Name.str()));
const FilePath path = FilePath::fromUserInput(QString::fromStdString(Name.str()));
const expected_str<QByteArray> contents = path.fileContents(FileSize, 0);
QTC_ASSERT_EXPECTED(contents, return std::error_code());
@@ -72,7 +72,7 @@ public:
ErrorOr<Status> status(const Twine &Path) override
{
const Utils::FilePath path = FilePath::fromString(QString::fromStdString(Path.str()));
const FilePath path = FilePath::fromUserInput(QString::fromStdString(Path.str()));
QFileInfo fInfo(QString::fromStdString(Path.str()));
if (!fInfo.exists())

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

@@ -146,9 +146,9 @@ const QString stmCubeProgrammerDetectionPath{HostOsInfo::isWindowsHost()
? QString("bin/STM32_Programmer_CLI.exe")
: QString("bin/STM32_Programmer.sh")};
const char renesasProgrammerSetting[]{"FlashProgrammerPath"};
const char renesasProgrammerSetting[]{"RenesasFlashProgrammer"};
const char renesasProgrammerCmakeVar[]{"RENESAS_FLASH_PROGRAMMER_PATH"};
const QString renesasProgrammerEnvVar{"RenesasFlashProgrammer_PATH"};
const char renesasProgrammerEnvVar[]{"RENESAS_FLASH_PROGRAMMER_PATH"};
const char renesasProgrammerLabel[]{"Renesas Flash Programmer"};
const QString renesasProgrammerDetectionPath{HostOsInfo::withExecutableSuffix("rfp-cli")};
@@ -1539,9 +1539,9 @@ void McuSupportTest::test_legacy_createThirdPartyPackage_data()
<< PackageCreator{[this]() {
return Legacy::createRenesasProgrammerPackage(settingsMockPtr);
}}
<< ghs_rh850_d1m1a_baremetal_json << defaultToolPath << defaultToolPath
<< renesasProgrammerSetting << renesasProgrammerCmakeVar << renesasProgrammerEnvVar
<< renesasProgrammerLabel << renesasProgrammerDetectionPath;
<< ghs_rh850_d1m1a_baremetal_json << empty << empty << renesasProgrammerSetting
<< renesasProgrammerCmakeVar << renesasProgrammerEnvVar << renesasProgrammerLabel
<< renesasProgrammerDetectionPath;
}
void McuSupportTest::test_legacy_createThirdPartyPackage()
@@ -1574,7 +1574,53 @@ void McuSupportTest::test_legacy_createThirdPartyPackage()
void McuSupportTest::test_createThirdPartyPackage_data()
{
test_legacy_createThirdPartyPackage_data();
QTest::addColumn<QString>("json");
QTest::addColumn<QString>("path");
QTest::addColumn<QString>("defaultPath");
QTest::addColumn<QString>("setting");
QTest::addColumn<QString>("cmakeVar");
QTest::addColumn<QString>("envVar");
QTest::addColumn<QString>("label");
QTest::addColumn<QString>("detectionPath");
// Sometimes the jsons have different values than the legacy packages
// Enter the expected values from the jsons here when they diverge from legacy values
QString programFiles = qtcEnvironmentVariable("Env:PROGRAMFILES(x86)");
const QString renesasProgrammerDefaultPath = {
HostOsInfo::isWindowsHost()
? QString("%1/Renesas Electronics/Programming Tools/Renesas "
"Flash Programmer V3.09").arg(programFiles)
: QString("")};
QTest::newRow("armgcc_mimxrt1050_evk_freertos_json mcuXpresso")
<< armgcc_mimxrt1050_evk_freertos_json << xpressoIdePath << xpressoIdePath
<< xpressoIdeSetting << xpressoIdeCmakeVar << xpressoIdeEnvVar << xpressoIdeLabel
<< xpressoIdeDetectionPath;
QTest::newRow("armgcc_mimxrt1064_evk_freertos_json mcuXpresso")
<< armgcc_mimxrt1064_evk_freertos_json << xpressoIdePath << xpressoIdePath
<< xpressoIdeSetting << xpressoIdeCmakeVar << xpressoIdeEnvVar << xpressoIdeLabel
<< xpressoIdeDetectionPath;
QTest::newRow("armgcc_mimxrt1170_evk_freertos_json mcuXpresso")
<< armgcc_mimxrt1170_evk_freertos_json << xpressoIdePath << xpressoIdePath
<< xpressoIdeSetting << xpressoIdeCmakeVar << xpressoIdeEnvVar << xpressoIdeLabel
<< xpressoIdeDetectionPath;
QTest::newRow("armgcc_stm32h750b_discovery_baremetal_json stmCubeProgrammer")
<< armgcc_stm32h750b_discovery_baremetal_json << stmCubeProgrammerPath
<< stmCubeProgrammerPath << stmCubeProgrammerSetting << empty << empty
<< stmCubeProgrammerLabel << stmCubeProgrammerDetectionPath;
QTest::newRow("armgcc_stm32f769i_discovery_freertos_json stmCubeProgrammer")
<< armgcc_stm32f769i_discovery_freertos_json << stmCubeProgrammerPath
<< stmCubeProgrammerPath << stmCubeProgrammerSetting << empty << empty
<< stmCubeProgrammerLabel << stmCubeProgrammerDetectionPath;
QTest::newRow("ghs_rh850_d1m1a_baremetal_json renesasProgrammer")
<< ghs_rh850_d1m1a_baremetal_json << renesasProgrammerDefaultPath << empty
<< "FlashProgrammerPath" << renesasProgrammerCmakeVar << "RenesasFlashProgrammer_PATH"
<< renesasProgrammerLabel << renesasProgrammerDetectionPath;
}
void McuSupportTest::test_createThirdPartyPackage()

4
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -61,7 +61,9 @@ static const QList<Target *> targetsForSelection(const Project *project,
{
if (targetSelection == ConfigSelection::All)
return project->targets();
return {project->activeTarget()};
if (project->activeTarget())
return {project->activeTarget()};
return {};
}
static const QList<BuildConfiguration *> buildConfigsForSelection(const Target *target,