forked from qt-creator/qt-creator
Revert "McuSupport: CMake expects programmer path to include the bin folder"
This reverts commit e558fc4d1f.
Reason for revert: Because this is incompatible with how QtCreator 8
makes kits, it breaks the kit when changing versions. A fix for the
original issue was made in Qt for MCUs to accommodate not having bin
the path, allowing the detectionPath to be bin/... in matching with
legacy code.
Change-Id: I64c670398287b3ec9beec0aa6fac02325b322664
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -369,8 +369,8 @@ McuPackagePtr createStm32CubeProgrammerPackage(const SettingsHandler::Ptr &setti
|
||||
FilePath defaultPath = {};
|
||||
|
||||
const FilePath detectionPath = FilePath::fromUserInput(
|
||||
QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "STM32_Programmer_CLI.exe"
|
||||
: "STM32_Programmer.sh"));
|
||||
QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "bin/STM32_Programmer_CLI.exe"
|
||||
: "bin/STM32_Programmer.sh"));
|
||||
|
||||
return McuPackagePtr{
|
||||
new McuPackage(settingsHandler,
|
||||
|
||||
Reference in New Issue
Block a user