diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-02 12:59:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-07 13:19:54 +0000 |
| commit | 825f98815683faea06144ab0262129b0367798ee (patch) | |
| tree | 48b10de0d86c6312d07700eb4e690dbd87ab8db0 /src/corelib/codecs/qtextcodec.cpp | |
| parent | b5d249f9538bf3dc44f11879c2244deb5a37bf97 (diff) | |
Modernize the "textcodec" feature
Also clean up QTextCodec usage in qmake build and some includes
of qtextcodec.h.
Change-Id: I0475b82690024054add4e85a8724c8ea3adcf62a
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 790921610a..1ec443cd73 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -38,11 +38,10 @@ ****************************************************************************/ #include "qplatformdefs.h" + #include "qtextcodec.h" #include "qtextcodec_p.h" -#ifndef QT_NO_TEXTCODEC - #include "qbytearraymatcher.h" #include "qlist.h" #include "qfile.h" @@ -1221,5 +1220,3 @@ bool QTextDecoder::hasFailure() const } QT_END_NAMESPACE - -#endif // QT_NO_TEXTCODEC |