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/qtextcodec.cpp | |
| 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/qtextcodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 465caea62f..a5e91c5c95 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -65,15 +65,14 @@ # include "qtsciicodec_p.h" # include "qisciicodec_p.h" #if !defined(Q_OS_INTEGRITY) -# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) -// no iconv(3) support, must build all codecs into the library +# if !defined(QT_BOOTSTRAPPED) # include "../../plugins/codecs/cn/qgb18030codec.h" # include "../../plugins/codecs/jp/qeucjpcodec.h" # include "../../plugins/codecs/jp/qjiscodec.h" # include "../../plugins/codecs/jp/qsjiscodec.h" # include "../../plugins/codecs/kr/qeuckrcodec.h" # include "../../plugins/codecs/tw/qbig5codec.h" -# endif // QT_NO_ICONV +# endif // !QT_BOOTSTRAPPED # if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED) # include "qfontlaocodec_p.h" # include "../../plugins/codecs/jp/qfontjpcodec.h" @@ -730,8 +729,6 @@ static void setup() # if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED) // no font codecs when bootstrapping (void)new QFontLaoCodec; -# if defined(QT_NO_ICONV) - // no iconv(3) support, must build all codecs into the library (void)new QFontGb2312Codec; (void)new QFontGbkCodec; (void)new QFontGb18030_0Codec; @@ -740,12 +737,11 @@ static void setup() (void)new QFontKsc5601Codec; (void)new QFontBig5hkscsCodec; (void)new QFontBig5Codec; -# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED -# endif // Q_OS_UNIX +# endif // Q_OS_UNIX && !QT_BOOTSTRAPPED #if !defined(Q_OS_INTEGRITY) -# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) +# if !defined(QT_BOOTSTRAPPED) // no asian codecs when bootstrapping, sorry (void)new QGb18030Codec; (void)new QGbkCodec; @@ -757,7 +753,7 @@ static void setup() (void)new QCP949Codec; (void)new QBig5Codec; (void)new QBig5hkscsCodec; -# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED +# endif // !QT_BOOTSTRAPPED #endif // !Q_OS_INTEGRITY #endif // QT_NO_CODECS |