diff options
Diffstat (limited to 'src/corelib/codecs/qtextcodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index adb84a1856..fedd39e104 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -58,8 +58,10 @@ #include "qlatincodec_p.h" #if !defined(QT_BOOTSTRAPPED) +#if QT_CONFIG(codecs) # include "qtsciicodec_p.h" # include "qisciicodec_p.h" +#endif #if QT_CONFIG(icu) #include "qicucodec_p.h" #else @@ -70,7 +72,7 @@ # include "qwindowscodec_p.h" #endif # include "qsimplecodec_p.h" -#if !defined(QT_NO_BIG_CODECS) +#if QT_CONFIG(big_codecs) # ifndef Q_OS_INTEGRITY # include "qgb18030codec_p.h" # include "qeucjpcodec_p.h" @@ -79,7 +81,7 @@ # include "qeuckrcodec_p.h" # include "qbig5codec_p.h" # endif // !Q_OS_INTEGRITY -#endif // !QT_NO_BIG_CODECS +#endif // big_codecs #endif // icu #endif // QT_BOOTSTRAPPED @@ -269,14 +271,14 @@ static void setup() return; initialized = true; -#if !defined(QT_NO_CODECS) && !defined(QT_BOOTSTRAPPED) +#if QT_CONFIG(codecs) && !defined(QT_BOOTSTRAPPED) (void)new QTsciiCodec; for (int i = 0; i < 9; ++i) (void)new QIsciiCodec(i); for (int i = 0; i < QSimpleTextCodec::numSimpleCodecs; ++i) (void)new QSimpleTextCodec(i); -# if !defined(QT_NO_BIG_CODECS) && !defined(Q_OS_INTEGRITY) +# if QT_CONFIG(big_codecs) && !defined(Q_OS_INTEGRITY) (void)new QGb18030Codec; (void)new QGbkCodec; (void)new QGb2312Codec; @@ -287,14 +289,14 @@ static void setup() (void)new QCP949Codec; (void)new QBig5Codec; (void)new QBig5hkscsCodec; -# endif // !QT_NO_BIG_CODECS && !Q_OS_INTEGRITY +# endif // big_codecs && !Q_OS_INTEGRITY #if QT_CONFIG(iconv) (void) new QIconvCodec; #endif #if defined(Q_OS_WIN32) (void) new QWindowsLocalCodec; #endif // Q_OS_WIN32 -#endif // !QT_NO_CODECS && !QT_BOOTSTRAPPED +#endif // codecs && !QT_BOOTSTRAPPED (void)new QUtf16Codec; (void)new QUtf16BECodec; |