diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-14 06:56:58 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-14 06:56:58 (GMT) |
| commit | 9092d68e8a0d8124346069a8fe7949d64aebd178 (patch) | |
| tree | 78d636c941d9d12f9a8bf751f1ea17bf8c87ce7e /src/corelib/codecs/qiconvcodec.cpp | |
| parent | 3aa5fec77b2e1edbcbd1d7735389725076f91cbf (diff) | |
| parent | bd8f1171ea1d564bb9b8e04b1a220e5559d60423 (diff) | |
| download | Qt-9092d68e8a0d8124346069a8fe7949d64aebd178.zip Qt-9092d68e8a0d8124346069a8fe7949d64aebd178.tar.gz Qt-9092d68e8a0d8124346069a8fe7949d64aebd178.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/codecs/qiconvcodec.cpp')
| -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 389bb48..8c4cc82 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" |