McuSupport: Use PROGRAMFILES environment variable

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>

14 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h
index 479074d01d8..84e29625de0 100644
--- a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h
+++ b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h
@@ -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,
diff --git a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h
index 578f3071e05..738cba2f67f 100644
--- a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h
+++ b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h
@@ -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,
diff --git a/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h
index 4d945ededc3..d67026d9fef 100644
--- a/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h
+++ b/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h
@@ -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": {
diff --git a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h
index a748335707b..c6464c10a75 100644
--- a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h
+++ b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h
@@ -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": {
diff --git a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h
index 3d3acd05e07..34da0c65a43 100644
--- a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h
+++ b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h
@@ -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": {
diff --git a/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h
index 922f444ce66..99aa4cede3f 100644
--- a/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h
+++ b/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h
@@ -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": {
diff --git a/src/plugins/mcusupport/test/errors_json.h b/src/plugins/mcusupport/test/errors_json.h
index ce74f5d90c0..92f3dc21b7e 100644
--- a/src/plugins/mcusupport/test/errors_json.h
+++ b/src/plugins/mcusupport/test/errors_json.h
@@ -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
diff --git a/src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h b/src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h
index 32422dc5f2e..e6203cbf1c2 100644
--- a/src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h
+++ b/src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h
@@ -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": {
diff --git a/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h b/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h
index c612bd42ebd..579e04908dd 100644
--- a/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h
+++ b/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h
@@ -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,
diff --git a/src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h b/src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h
index 98ebfbb4b1c..70e49c8c37d 100644
--- a/src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h
+++ b/src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h
@@ -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,
diff --git a/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h
index c5b2c4cba60..793097d5f6a 100644
--- a/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h
+++ b/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h
@@ -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": {
diff --git a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h
index 5ac1c9f67df..47df7469ab5 100644
--- a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h
+++ b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h
@@ -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": {
diff --git a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h
index 19e77fd5e08..71181fdca5b 100644
--- a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h
+++ b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h
@@ -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": {
diff --git a/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h
index ae76ca9bd15..9c657ab8cc6 100644
--- a/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h
+++ b/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h
@@ -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": {