From 4616c134aa4ab37b647bc1fa3999c0592962177e Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@qt.io>
Date: Thu, 27 May 2021 09:34:55 +0200
Subject: [PATCH] McuSupport: default path for STM32CubeProgrammer for
 non-Windows

Task-number: QTCREATORBUG-25788
Change-Id: If29351eaee6f14315df2a2471d2de4c254ef1c8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/mcusupport/mcusupportsdk.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp
index b0e1395bae4..e5bb7f911b5 100644
--- a/src/plugins/mcusupport/mcusupportsdk.cpp
+++ b/src/plugins/mcusupport/mcusupportsdk.cpp
@@ -194,11 +194,15 @@ static McuPackage *createRGLPackage()
 static McuPackage *createStm32CubeProgrammerPackage()
 {
     QString defaultPath = QDir::homePath();
+    const QString cubePath = "/STMicroelectronics/STM32Cube/STM32CubeProgrammer/";
     if (Utils::HostOsInfo::isWindowsHost()) {
-        const QString programPath =
-                findInProgramFiles("/STMicroelectronics/STM32Cube/STM32CubeProgrammer/");
+        const QString programPath = findInProgramFiles(cubePath);
         if (!programPath.isEmpty())
             defaultPath = programPath;
+    } else {
+        const QString programPath = QDir::homePath() + cubePath;
+        if (QFileInfo::exists(programPath))
+            defaultPath = programPath;
     }
     auto result = new McuPackage(
                 McuPackage::tr("STM32CubeProgrammer"),