diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-07-21 00:31:37 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:12:28 +0200 |
| commit | 88d2e92b39ffd4a6ea9446498ad5a1cb208022a6 (patch) | |
| tree | d64944f988a79bc8cbc556f6191e15bbe59b9cfc /src/corelib/codecs/codecs.pri | |
| parent | 865a9465f36edaf773b7836ee005ca96502dfca9 (diff) | |
ICU code page conversion support
Use ICU to do code page conversion instead of the
builtin text codecs. With this QTextCodec simply
becomes a wrapper around ICU's ucnv_* methods.
We only keep our own codecs for UTF-*, ISO-8859-1,
ISO-8859-15 for performance reasons, and for TSCII
and iscii-* because they aren't supported by ICU.
Change-Id: I4fc49eba55cf772b9772c6dac606a47a44346a60
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/codecs/codecs.pri')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index b08d412452..d049e52275 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -3,32 +3,43 @@ HEADERS += \ codecs/qisciicodec_p.h \ codecs/qlatincodec_p.h \ - codecs/qsimplecodec_p.h \ codecs/qtextcodec_p.h \ codecs/qtextcodec.h \ codecs/qtsciicodec_p.h \ - codecs/qutfcodec_p.h \ - codecs/qgb18030codec_p.h \ - codecs/qeucjpcodec_p.h \ - codecs/qjiscodec_p.h \ - codecs/qsjiscodec_p.h \ - codecs/qeuckrcodec_p.h \ - codecs/qbig5codec_p.h + codecs/qutfcodec_p.h SOURCES += \ codecs/qisciicodec.cpp \ codecs/qlatincodec.cpp \ - codecs/qsimplecodec.cpp \ codecs/qtextcodec.cpp \ codecs/qtsciicodec.cpp \ - codecs/qutfcodec.cpp \ - codecs/qgb18030codec.cpp \ - codecs/qjpunicode.cpp \ - codecs/qeucjpcodec.cpp \ - codecs/qjiscodec.cpp \ - codecs/qsjiscodec.cpp \ - codecs/qeuckrcodec.cpp \ - codecs/qbig5codec.cpp + codecs/qutfcodec.cpp + +contains(QT_CONFIG,icu) { + HEADERS += \ + codecs/qicucodec_p.h + SOURCES += \ + codecs/qicucodec.cpp +} else { + HEADERS += \ + codecs/qsimplecodec_p.h \ + codecs/qgb18030codec_p.h \ + codecs/qeucjpcodec_p.h \ + codecs/qjiscodec_p.h \ + codecs/qsjiscodec_p.h \ + codecs/qeuckrcodec_p.h \ + codecs/qbig5codec_p.h + + SOURCES += \ + codecs/qsimplecodec.cpp \ + codecs/qgb18030codec.cpp \ + codecs/qjpunicode.cpp \ + codecs/qeucjpcodec.cpp \ + codecs/qjiscodec.cpp \ + codecs/qsjiscodec.cpp \ + codecs/qeuckrcodec.cpp \ + codecs/qbig5codec.cpp +} unix:!qnx:!mac:!ios:!linux-android-* { contains(QT_CONFIG,iconv) { |