From 5b2ca680a7c26a476e92582932aca016a11374b1 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Thu, 17 Oct 2019 18:30:12 +0200
Subject: [PATCH] McuSupport: add /bin path of "stm32CubeProgrammer" to Path

... and make the detection a bit more explicit.

Change-Id: I8dc4f6dbdcc44e4e3cd56e332dd6d5ca6fa12021
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/mcusupport/mcusupportoptionspage.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index 2459776b39c..da1bf9f0d93 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -370,8 +370,10 @@ static PackageOptions* createStm32CubeProgrammerPackage()
     auto result = new PackageOptions(
                 McuSupportOptionsPage::tr("STM32CubeProgrammer"),
                 defaultPath,
-                "bin",
+                QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "/bin/STM32_Programmer_CLI.exe"
+                                                                 : "/bin/STM32_Programmer.sh"),
                 "stm32CubeProgrammer");
+    result->setRelativePathModifier("/bin");
     result->setDownloadUrl(
                 QUrl::fromUserInput("https://www.st.com/en/development-tools/stm32cubeprog.html"));
     result->setAddToPath(true);