diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-28 10:33:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-12 14:26:27 +0000 |
| commit | 9c8ca26a4829d5ce810c9653fec3dfe48717f0b1 (patch) | |
| tree | c04781ac8c8e5f24874838825375ce13d8ca9ec2 /src/corelib/codecs/qtextcodec.cpp | |
| parent | 4e7b58629a0a431fbd5c0ba287c3958efd05da13 (diff) | |
Modernize the "codecs" feature
Change-Id: Idee19112581bff64a2e0b8e331dd3d779aca165b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/codecs/qtextcodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 58fc72c9ce..790921610a 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -57,8 +57,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 @@ -268,7 +270,7 @@ 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); @@ -293,7 +295,7 @@ static void setup() #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; |