diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-10-13 21:04:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-13 21:04:13 +0200 |
commit | a801a2031dd55ab365da82c1f6bd90bf85f352fb (patch) | |
tree | 38258be818ed271f246c576c5ac0a0eb7e672747 /core | |
parent | fd2dcba02ceda5a361fae5e65cd73a39a583b984 (diff) | |
parent | 28c163a432b8eade0847103febd6bee4de127054 (diff) |
Merge pull request #53773 from nathanfranke/fix-license-character-encoding
Diffstat (limited to 'core')
-rw-r--r-- | core/config/engine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/config/engine.cpp b/core/config/engine.cpp index d8fbb50a75..dc5b3e25c6 100644 --- a/core/config/engine.cpp +++ b/core/config/engine.cpp @@ -111,7 +111,7 @@ Dictionary Engine::get_version_info() const { static Array array_from_info(const char *const *info_list) { Array arr; for (int i = 0; info_list[i] != nullptr; i++) { - arr.push_back(info_list[i]); + arr.push_back(String::utf8(info_list[i])); } return arr; } @@ -119,7 +119,7 @@ static Array array_from_info(const char *const *info_list) { static Array array_from_info_count(const char *const *info_list, int info_count) { Array arr; for (int i = 0; i < info_count; i++) { - arr.push_back(info_list[i]); + arr.push_back(String::utf8(info_list[i])); } return arr; } @@ -140,14 +140,14 @@ Array Engine::get_copyright_info() const { for (int component_index = 0; component_index < COPYRIGHT_INFO_COUNT; component_index++) { const ComponentCopyright &cp_info = COPYRIGHT_INFO[component_index]; Dictionary component_dict; - component_dict["name"] = cp_info.name; + component_dict["name"] = String::utf8(cp_info.name); Array parts; for (int i = 0; i < cp_info.part_count; i++) { const ComponentCopyrightPart &cp_part = cp_info.parts[i]; Dictionary part_dict; part_dict["files"] = array_from_info_count(cp_part.files, cp_part.file_count); part_dict["copyright"] = array_from_info_count(cp_part.copyright_statements, cp_part.copyright_count); - part_dict["license"] = cp_part.license; + part_dict["license"] = String::utf8(cp_part.license); parts.push_back(part_dict); } component_dict["parts"] = parts; |