diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-07-04 00:42:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-20 18:48:22 +0100 |
| commit | 7ee3d8c8ecb78dd7c5ae09b04ebf1420958f0001 (patch) | |
| tree | 562611571f90778d187514976fda15ae6b13a18b /src/corelib/codecs/codecs.pri | |
| parent | 85594bd972c1aa9b3f92640d1624822e636431fb (diff) | |
build and load text codecs regardless of iconv and platform
Otherwise applications linking to static Qt may have to import
the static plugins to avoid linking failure even if they do not
use the codecs, which is a nuisance.
Also, this is preparation for moving these codecs into QtCore
proper.
Change-Id: I71f3bbb0bac6261983143d0578757b34997d1364
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/codecs/codecs.pri')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index 0495d784e5..934242e49b 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -8,7 +8,14 @@ HEADERS += \ codecs/qtextcodec.h \ codecs/qtsciicodec_p.h \ codecs/qutfcodec_p.h \ - codecs/qtextcodecplugin.h + codecs/qtextcodecplugin.h \ + ../plugins/codecs/cn/qgb18030codec.h \ + ../plugins/codecs/jp/qeucjpcodec.h \ + ../plugins/codecs/jp/qjiscodec.h \ + ../plugins/codecs/jp/qsjiscodec.h \ + ../plugins/codecs/kr/qeuckrcodec.h \ + ../plugins/codecs/tw/qbig5codec.h \ + ../plugins/codecs/jp/qfontjpcodec.h SOURCES += \ codecs/qisciicodec.cpp \ @@ -17,7 +24,15 @@ SOURCES += \ codecs/qtextcodec.cpp \ codecs/qtsciicodec.cpp \ codecs/qutfcodec.cpp \ - codecs/qtextcodecplugin.cpp + codecs/qtextcodecplugin.cpp \ + ../plugins/codecs/cn/qgb18030codec.cpp \ + ../plugins/codecs/jp/qjpunicode.cpp \ + ../plugins/codecs/jp/qeucjpcodec.cpp \ + ../plugins/codecs/jp/qjiscodec.cpp \ + ../plugins/codecs/jp/qsjiscodec.cpp \ + ../plugins/codecs/kr/qeuckrcodec.cpp \ + ../plugins/codecs/tw/qbig5codec.cpp \ + ../plugins/codecs/jp/qfontjpcodec.cpp unix { SOURCES += codecs/qfontlaocodec.cpp @@ -34,24 +49,5 @@ unix { HEADERS += codecs/qiconvcodec_p.h SOURCES += codecs/qiconvcodec.cpp DEFINES += GNU_LIBICONV - } else { - # no iconv, so we put all plugins in the library - HEADERS += \ - ../plugins/codecs/cn/qgb18030codec.h \ - ../plugins/codecs/jp/qeucjpcodec.h \ - ../plugins/codecs/jp/qjiscodec.h \ - ../plugins/codecs/jp/qsjiscodec.h \ - ../plugins/codecs/kr/qeuckrcodec.h \ - ../plugins/codecs/tw/qbig5codec.h \ - ../plugins/codecs/jp/qfontjpcodec.h - SOURCES += \ - ../plugins/codecs/cn/qgb18030codec.cpp \ - ../plugins/codecs/jp/qjpunicode.cpp \ - ../plugins/codecs/jp/qeucjpcodec.cpp \ - ../plugins/codecs/jp/qjiscodec.cpp \ - ../plugins/codecs/jp/qsjiscodec.cpp \ - ../plugins/codecs/kr/qeuckrcodec.cpp \ - ../plugins/codecs/tw/qbig5codec.cpp \ - ../plugins/codecs/jp/qfontjpcodec.cpp } } |