From 565d205d910af5cb8eb321979171784e5a75c6df Mon Sep 17 00:00:00 2001 From: Gromph <361560+Gromph@users.noreply.github.com> Date: Wed, 14 Apr 2021 18:01:08 -0700 Subject: [PATCH] UWP: Keep upstream names for capabilities preset settings to avoid mismatch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous code used `camelcase_to_underscore` to prettify the names for display in the export preset, but it leads to inconsistencies if we don't make sure to do the reverse operation when writing to the `AppxManifest.xml`. It's simpler to keep the same names as in the manifest, which is also what users will see referenced in MS documentation. Fixes #47900. Co-authored-by: Rémi Verschelde (cherry picked from commit c87e49d7bc876dd0dd6e5a619d9483ed20e4ffbe) --- platform/uwp/export/export.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp index 44017edac92..294b5f3d215 100644 --- a/platform/uwp/export/export.cpp +++ b/platform/uwp/export/export.cpp @@ -1056,19 +1056,19 @@ public: // Capabilities const char **basic = uwp_capabilities; while (*basic) { - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*basic).camelcase_to_underscore(false)), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*basic)), false)); basic++; } const char **uap = uwp_uap_capabilities; while (*uap) { - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*uap).camelcase_to_underscore(false)), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*uap)), false)); uap++; } const char **device = uwp_device_capabilities; while (*device) { - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*device).camelcase_to_underscore(false)), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*device)), false)); device++; } }