From ebc2628116203a53e54b54dc297ce94993e08f1a Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 4 Nov 2019 16:24:19 +0100 Subject: [PATCH] McuSupport: Adjust default path for SEGGER JLink Change-Id: Iace2010f35bbaad3d1db749d6e05e2faa347c803 Reviewed-by: Aurindam Jana --- src/plugins/mcusupport/mcusupportoptions.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index ec4717f53f6..658e0568ef1 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -319,7 +319,8 @@ static PackageOptions *createSeggerJLinkPackage() { const QString defaultPath = Utils::HostOsInfo::isWindowsHost() ? - QDir::fromNativeSeparators(qEnvironmentVariable("ProgramFiles")) + "/SEGGER/JLink" + QDir::fromNativeSeparators(qEnvironmentVariable("ProgramFiles(x86)")) + + "/SEGGER/JLink" : QString("%{Env:SEGGER_JLINK_SOFTWARE_AND_DOCUMENTATION_PATH}"); auto result = new PackageOptions( PackageOptions::tr("SEGGER JLink"),