From faaa71baa0ce7da942d7bdee2a1b79de80107da4 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sun, 14 May 2017 20:04:12 -0700
Subject: [PATCH] [qt5] Use _CL_ to add /utf-8 to all compiler lines.

Fixes #1092.
Fixes #1037.
Fixes #1024.
---
 ports/qt5/CONTROL        | 2 +-
 ports/qt5/portfile.cmake | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index 1bda3a3481..8d95c691eb 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5
-Version: 5.8-1
+Version: 5.8-2
 Description: Qt5 application framework main components. Webengine, examples and tests not included.
 Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre, harfbuzz, sqlite3, libpq, double-conversion
diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake
index f5d8bbc636..ee871b155f 100644
--- a/ports/qt5/portfile.cmake
+++ b/ports/qt5/portfile.cmake
@@ -21,6 +21,9 @@ vcpkg_apply_patches(
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-qalgorithms-vs2017.patch" "${CMAKE_CURRENT_LIST_DIR}/fix-commandline-overrides.patch"
 )
 
+# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
+set(ENV{_CL_} "/utf-8")
+
 configure_qt(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS