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

McuSupport: default path for STM32CubeProgrammer for non-Windows

Browse Source 
Task-number: QTCREATORBUG-25788
Change-Id: If29351eaee6f14315df2a2471d2de4c254ef1c8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christiaan Janssen
2021-05-27 09:34:55 +02:00
committed by christiaan.janssen
parent 588ce3a390
commit 4616c134aa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,11 +194,15 @@ static McuPackage *createRGLPackage()
static McuPackage *createStm32CubeProgrammerPackage() static McuPackage *createStm32CubeProgrammerPackage()
{ {
QString defaultPath = QDir::homePath(); QString defaultPath = QDir::homePath();
const QString cubePath = "/STMicroelectronics/STM32Cube/STM32CubeProgrammer/";
if (Utils::HostOsInfo::isWindowsHost()) { if (Utils::HostOsInfo::isWindowsHost()) {
const QString programPath = const QString programPath = findInProgramFiles(cubePath);
findInProgramFiles("/STMicroelectronics/STM32Cube/STM32CubeProgrammer/");
if (!programPath.isEmpty()) if (!programPath.isEmpty())
defaultPath = programPath; defaultPath = programPath;
} else {
const QString programPath = QDir::homePath() + cubePath;
if (QFileInfo::exists(programPath))
defaultPath = programPath;
} }
auto result = new McuPackage( auto result = new McuPackage(
McuPackage::tr("STM32CubeProgrammer"), McuPackage::tr("STM32CubeProgrammer"),