diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-15 20:14:27 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-05-15 20:14:27 -0700 |
| commit | e66d5f46c7ebf247ec350b19989adba3de7deaec (patch) | |
| tree | 53e4387e3fee76475a454b48f5dbfa0ffee13847 | |
| parent | 7b71ac70fe0ce2c23908d5228cde7f7b04b603cc (diff) | |
| parent | faaa71baa0ce7da942d7bdee2a1b79de80107da4 (diff) | |
| download | vcpkg-e66d5f46c7ebf247ec350b19989adba3de7deaec.tar.gz vcpkg-e66d5f46c7ebf247ec350b19989adba3de7deaec.zip | |
Merge branch 'qt5-gbk'
| -rw-r--r-- | ports/qt5/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5/portfile.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 1bda3a348..8d95c691e 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 f5d8bbc63..ee871b155 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 |