diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-08 16:50:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 16:50:14 +0100 |
| commit | b867ef0eec2975c7a87762498fb2926c575d6676 (patch) | |
| tree | c6e19dcdf00da192605d5fb2472d644f0a82ef11 | |
| parent | 17d92c2b0995e82f5291c5a1e097e7b607151d31 (diff) | |
| parent | 5890e7060e49ab6aab48a3be70baa573ea94d478 (diff) | |
Merge pull request #25570 from Kanabenki/windows-relative-icon
Use relative path property hint for windows export icon
| -rw-r--r-- | platform/windows/export/export.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index ca2f71ca18..141ab96370 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -73,7 +73,7 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset> } #endif - String icon_path = p_preset->get("application/icon"); + String icon_path = ProjectSettings::get_singleton()->globalize_path(p_preset->get("application/icon")); String file_verion = p_preset->get("application/file_version"); String product_version = p_preset->get("application/product_version"); String company_name = p_preset->get("application/company_name"); @@ -137,7 +137,7 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset> void EditorExportPlatformWindows::get_export_options(List<ExportOption> *r_options) { EditorExportPlatformPC::get_export_options(r_options); - r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_GLOBAL_FILE, "*.ico"), "")); + r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_FILE, "*.ico"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/file_version"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/product_version"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/company_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Company Name"), "")); |