diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-03-03 14:26:38 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-03 14:27:39 +0000 |
| commit | dc043a0252c0eb8041b032d88b6f28c9c74a1a7a (patch) | |
| tree | 4b2cba000a4976a865eacfaf000bac700f8eb87c /testing/qt5-qtbase/qt-musl-iconv-no-bom.patch | |
| parent | 74532119b8110896689d2eeb270c620a89b01f59 (diff) | |
testing/qt5-*: upgrade to 5.2.1, fix musl build
Diffstat (limited to 'testing/qt5-qtbase/qt-musl-iconv-no-bom.patch')
| -rw-r--r-- | testing/qt5-qtbase/qt-musl-iconv-no-bom.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/testing/qt5-qtbase/qt-musl-iconv-no-bom.patch b/testing/qt5-qtbase/qt-musl-iconv-no-bom.patch new file mode 100644 index 00000000000..35380ad6714 --- /dev/null +++ b/testing/qt5-qtbase/qt-musl-iconv-no-bom.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig ++++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp +@@ -62,7 +62,7 @@ + #elif defined(Q_OS_AIX) + # define NO_BOM + # define UTF16 "UCS-2" +-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) ++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) + # define NO_BOM + # if Q_BYTE_ORDER == Q_BIG_ENDIAN + # define UTF16 "UTF-16BE" |