Merge branch 'qt5-gbk'

This commit is contained in:
Robert Schumacher 2017-05-15 20:14:27 -07:00
commit e66d5f46c7
2 changed files with 4 additions and 1 deletions

View File

@ -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

View File

@ -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