diff options
| author | Raphael Kubo da Costa <kubito@gmail.com> | 2009-09-13 07:40:37 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-13 07:41:47 (GMT) |
| commit | bd8f1171ea1d564bb9b8e04b1a220e5559d60423 (patch) | |
| tree | d9f2072dad64d23d7121c3a3f8e0a2f839d0f6fa /src/corelib/codecs | |
| parent | 0293aff5c44202e5c62e229b74d8bd0bf9206185 (diff) | |
| download | Qt-bd8f1171ea1d564bb9b8e04b1a220e5559d60423.zip Qt-bd8f1171ea1d564bb9b8e04b1a220e5559d60423.tar.gz Qt-bd8f1171ea1d564bb9b8e04b1a220e5559d60423.tar.bz2 | |
Fix libiconv support on FreeBSD.
For some reason iconv support was broken in Qt 4.5 on FreeBSD, and this
patch was made to fix that.
Original patch by Max Brazhnikov <makc@freebsd.org>.
Original message:
Enable libiconv support.
Didn't get where the real problem is, but using UTF-16LE/BE as default
encoding (see patch) fixes the issue.
Merge-request: 1480
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qiconvcodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp index 6153d70..e4389b9 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/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_MAC) +#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) # define NO_BOM # if Q_BYTE_ORDER == Q_BIG_ENDIAN # define UTF16 "UTF-16BE" |