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

McuSupport: Use PROGRAMFILES environment variable

Browse Source 
The path was generated using the environment variable PROGRAMSANDFILES,
while only PROGRAMFILES is defined.

Task-number: UL-6618
Change-Id: I5ebff81d39a437586af905f56099c17c1afc1bd0
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Rainer Keller
2022-10-24 11:20:46 +02:00
parent a62155d98a
commit 2c6235998d
14 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h
View File

@@ -21,7 +21,7 @@ constexpr auto armgcc_ek_ra6m3g_baremetal_json = R"(
"label": "Path to SEGGER J-Link",
"type": "path",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink",
"windows": "%{Env:PROGRAMFILES}/SEGGER/JLink",
"linux": "/opt/SEGGER/JLink"
},
"optional": true,

2
src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h
View File

@@ -21,7 +21,7 @@ constexpr auto armgcc_ek_ra6m3g_freertos_json = R"(
"label": "Path to SEGGER J-Link",
"type": "path",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink",
"windows": "%{Env:PROGRAMFILES}/SEGGER/JLink",
"linux": "/opt/SEGGER/JLink"
},
"optional": true,

2
src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h
View File

@@ -20,7 +20,7 @@ constexpr auto armgcc_stm32f469i_discovery_baremetal_json = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"detectionPath": {

2
src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h
View File

@@ -20,7 +20,7 @@ constexpr auto armgcc_stm32f769i_discovery_baremetal_json = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"detectionPath": {

2
src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h
View File

@@ -20,7 +20,7 @@ constexpr auto armgcc_stm32f769i_discovery_freertos_json = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"detectionPath": {

2
src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h
View File

@@ -20,7 +20,7 @@ constexpr auto armgcc_stm32h750b_discovery_baremetal_json = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"detectionPath": {

2
src/plugins/mcusupport/test/errors_json.h
View File

@@ -90,7 +90,7 @@ constexpr auto mulitple_toolchain_versions = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"optional": false

2
src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h
View File

@@ -22,7 +22,7 @@ constexpr auto ghs_rh850_d1m1a_baremetal_json = R"(
"setting": "RenesasFlashProgrammer",
"cmakeVar": "RENESAS_FLASH_PROGRAMMER_PATH",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/Renesas Electronics/Programming Tools/Renesas Flash Programmer V3.09",
"windows": "%{Env:PROGRAMFILES}/Renesas Electronics/Programming Tools/Renesas Flash Programmer V3.09",
"linux": "%{Env:HOME}"
},
"detectionPath": {

2
src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h
View File

@@ -21,7 +21,7 @@ constexpr auto iar_ek_ra6m3g_baremetal_json = R"(
"label": "Path to SEGGER J-Link",
"type": "path",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink",
"windows": "%{Env:PROGRAMFILES}/SEGGER/JLink",
"linux": "/opt/SEGGER/JLink"
},
"optional": true,

2
src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h
View File

@@ -21,7 +21,7 @@ constexpr auto iar_ek_ra6m3g_freertos_json = R"(
"label": "Path to SEGGER J-Link",
"type": "path",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink",
"windows": "%{Env:PROGRAMFILES}/SEGGER/JLink",
"linux": "/opt/SEGGER/JLink"
},
"optional": true,

2
src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h
View File

@@ -20,7 +20,7 @@ constexpr auto iar_stm32f469i_discovery_baremetal_json = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"detectionPath": {

2
src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h
View File

@@ -20,7 +20,7 @@ constexpr auto iar_stm32f769i_discovery_baremetal_json = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"detectionPath": {

2
src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h
View File

@@ -20,7 +20,7 @@ constexpr auto iar_stm32f769i_discovery_freertos_json = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"detectionPath": {

2
src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h
View File

@@ -20,7 +20,7 @@ constexpr auto iar_stm32h750b_discovery_baremetal_json = R"(
"type": "path",
"setting": "Stm32CubeProgrammer",
"defaultValue": {
"windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
},
"detectionPath": {